summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Zach Hilman2018-09-19 09:09:03 -0400
committerGravatar Zach Hilman2018-09-19 09:09:11 -0400
commit9bba103791ba5740636ea94e7c1b87225a956c93 (patch)
treed52b1357c8673317a6d1e48f3424c9bf14b8437a
parentMerge pull request #1273 from Subv/ld_sizes (diff)
downloadyuzu-9bba103791ba5740636ea94e7c1b87225a956c93.tar.gz
yuzu-9bba103791ba5740636ea94e7c1b87225a956c93.tar.xz
yuzu-9bba103791ba5740636ea94e7c1b87225a956c93.zip
yuzu-cmd: Add call to CreateFactories
Ensures all relevant filesystem objects are initialized and eliminates a crash related to the RegisteredCache.
-rw-r--r--src/yuzu_cmd/yuzu.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index b1c364fbb..b2559b717 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -20,8 +20,10 @@
20#include "common/string_util.h" 20#include "common/string_util.h"
21#include "common/telemetry.h" 21#include "common/telemetry.h"
22#include "core/core.h" 22#include "core/core.h"
23#include "core/crypto/key_manager.h"
23#include "core/file_sys/vfs_real.h" 24#include "core/file_sys/vfs_real.h"
24#include "core/gdbstub/gdbstub.h" 25#include "core/gdbstub/gdbstub.h"
26#include "core/hle/service/filesystem/filesystem.h"
25#include "core/loader/loader.h" 27#include "core/loader/loader.h"
26#include "core/settings.h" 28#include "core/settings.h"
27#include "core/telemetry_session.h" 29#include "core/telemetry_session.h"
@@ -29,7 +31,6 @@
29#include "yuzu_cmd/emu_window/emu_window_sdl2.h" 31#include "yuzu_cmd/emu_window/emu_window_sdl2.h"
30 32
31#include <getopt.h> 33#include <getopt.h>
32#include "core/crypto/key_manager.h"
33#ifndef _MSC_VER 34#ifndef _MSC_VER
34#include <unistd.h> 35#include <unistd.h>
35#endif 36#endif
@@ -169,6 +170,7 @@ int main(int argc, char** argv) {
169 170
170 Core::System& system{Core::System::GetInstance()}; 171 Core::System& system{Core::System::GetInstance()};
171 system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>()); 172 system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>());
173 Service::FileSystem::CreateFactories(system.GetFilesystem());
172 174
173 SCOPE_EXIT({ system.Shutdown(); }); 175 SCOPE_EXIT({ system.Shutdown(); });
174 176