summaryrefslogtreecommitdiffstats
path: root/src/yuzu_cmd/yuzu.cpp
diff options
context:
space:
mode:
authorjroweboy <jroweboy@gmail.com>2019-09-22 15:40:57 +0200
committerFearlessTobi <thm.frey@gmail.com>2019-09-22 15:49:39 +0200
commit64dbc92b614bfa388d31007788bf725c4e4b59e3 (patch)
tree45a929441460b900174e33b13f1997e8986d3507 /src/yuzu_cmd/yuzu.cpp
parentMerge pull request #2867 from ReinUsesLisp/configure-framebuffers-clean (diff)
downloadyuzu-64dbc92b614bfa388d31007788bf725c4e4b59e3.tar
yuzu-64dbc92b614bfa388d31007788bf725c4e4b59e3.tar.gz
yuzu-64dbc92b614bfa388d31007788bf725c4e4b59e3.tar.bz2
yuzu-64dbc92b614bfa388d31007788bf725c4e4b59e3.tar.lz
yuzu-64dbc92b614bfa388d31007788bf725c4e4b59e3.tar.xz
yuzu-64dbc92b614bfa388d31007788bf725c4e4b59e3.tar.zst
yuzu-64dbc92b614bfa388d31007788bf725c4e4b59e3.zip
Diffstat (limited to '')
-rw-r--r--src/yuzu_cmd/yuzu.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index bac05b959..3ee088a91 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -186,8 +186,6 @@ int main(int argc, char** argv) {
system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>());
system.GetFileSystemController().CreateFactories(*system.GetFilesystem());
- SCOPE_EXIT({ system.Shutdown(); });
-
const Core::System::ResultStatus load_result{system.Load(*emu_window, filepath)};
switch (load_result) {
@@ -227,6 +225,8 @@ int main(int argc, char** argv) {
system.RunLoop();
}
+ system.Shutdown();
+
detached_tasks.WaitForAllTasks();
return 0;
}