diff options
| author | 2018-07-18 21:07:11 -0400 | |
|---|---|---|
| committer | 2018-07-18 18:07:11 -0700 | |
| commit | 29aff8d5ab46c8d0199aa4bfa7eeff5d4fa2d7ef (patch) | |
| tree | 3202e2ce55ab6387a4ca366a509eccdd963434c3 /src/core/core.cpp | |
| parent | Merge pull request #683 from DarkLordZach/touch (diff) | |
| download | yuzu-29aff8d5ab46c8d0199aa4bfa7eeff5d4fa2d7ef.tar.gz yuzu-29aff8d5ab46c8d0199aa4bfa7eeff5d4fa2d7ef.tar.xz yuzu-29aff8d5ab46c8d0199aa4bfa7eeff5d4fa2d7ef.zip | |
Virtual Filesystem 2: Electric Boogaloo (#676)
* Virtual Filesystem
* Fix delete bug and documentate
* Review fixes + other stuff
* Fix puyo regression
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 8335d502e..82db5cccf 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include "core/loader/loader.h" | 19 | #include "core/loader/loader.h" |
| 20 | #include "core/memory_setup.h" | 20 | #include "core/memory_setup.h" |
| 21 | #include "core/settings.h" | 21 | #include "core/settings.h" |
| 22 | #include "file_sys/vfs_real.h" | ||
| 22 | #include "video_core/video_core.h" | 23 | #include "video_core/video_core.h" |
| 23 | 24 | ||
| 24 | namespace Core { | 25 | namespace Core { |
| @@ -84,7 +85,7 @@ System::ResultStatus System::SingleStep() { | |||
| 84 | } | 85 | } |
| 85 | 86 | ||
| 86 | System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& filepath) { | 87 | System::ResultStatus System::Load(EmuWindow* emu_window, const std::string& filepath) { |
| 87 | app_loader = Loader::GetLoader(filepath); | 88 | app_loader = Loader::GetLoader(std::make_shared<FileSys::RealVfsFile>(filepath)); |
| 88 | 89 | ||
| 89 | if (!app_loader) { | 90 | if (!app_loader) { |
| 90 | LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath); | 91 | LOG_CRITICAL(Core, "Failed to obtain loader for {}!", filepath); |