From 28a5b3674cd4c5bd549d8cde817c35259e158003 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Wed, 20 Jun 2018 19:28:48 -0400
Subject: [PATCH] More changes

---
 src/core/file_sys/vfs_offset.cpp | 6 +++---
 src/core/file_sys/vfs_offset.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/file_sys/vfs_offset.cpp b/src/core/file_sys/vfs_offset.cpp
index 89b78bc610..39d5d06cf6 100644
--- a/src/core/file_sys/vfs_offset.cpp
+++ b/src/core/file_sys/vfs_offset.cpp
@@ -6,8 +6,8 @@
 
 namespace FileSys {
 
-OffsetVfsFile::OffsetVfsFile(VfsFile&& file, u64 offset, u64 size)
-    : file(std::make_unique<VfsFile>(file)), offset(offset), size(size) {}
+OffsetVfsFile::OffsetVfsFile(std::unique_ptr<VfsFile>&& file, u64 offset, u64 size)
+    : file(std::move(file)), offset(offset), size(size) {}
 
 bool OffsetVfsFile::IsReady() {
     return file->IsReady();
@@ -57,7 +57,7 @@ std::vector<u8> OffsetVfsFile::ReadBytes(u64 r_offset, u64 r_length) {
 u64 OffsetVfsFile::WriteBytes(const std::vector<u8>& data, u64 r_offset) {
     auto end = data.end();
     if (data.size() + r_offset > size)
-        end = data.begin + size - r_offset;
+        end = data.begin() + size - r_offset;
 
     return file->WriteBytes(std::vector<u8>(data.begin(), end), r_offset + offset);
 }
diff --git a/src/core/file_sys/vfs_offset.h b/src/core/file_sys/vfs_offset.h
index 68244c08d0..a78e9a3293 100644
--- a/src/core/file_sys/vfs_offset.h
+++ b/src/core/file_sys/vfs_offset.h
@@ -8,7 +8,7 @@
 namespace FileSys {
 
 struct OffsetVfsFile : public VfsFile {
-    OffsetVfsFile(VfsFile&& file, u64 offset, u64 size);
+    OffsetVfsFile(std::unique_ptr<VfsFile>&& file, u64 offset, u64 size);
 
     bool IsReady() override;
     bool IsGood() override;