summaryrefslogtreecommitdiffstats
path: root/src/yuzu_cmd/yuzu.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-10-04 21:51:03 +0200
committerGitHub <noreply@github.com>2019-10-04 21:51:03 +0200
commit94c34f23d7ba951e5f2b3afa7f1ad5a5ea170e35 (patch)
treec24ee7f0b9938cc9186ebd335e5de3a4841619cf /src/yuzu_cmd/yuzu.cpp
parentMerge pull request #2936 from VPeruS/use-isallzeroarray (diff)
parentAdd FPS to SDL title bar (diff)
downloadyuzu-94c34f23d7ba951e5f2b3afa7f1ad5a5ea170e35.tar
yuzu-94c34f23d7ba951e5f2b3afa7f1ad5a5ea170e35.tar.gz
yuzu-94c34f23d7ba951e5f2b3afa7f1ad5a5ea170e35.tar.bz2
yuzu-94c34f23d7ba951e5f2b3afa7f1ad5a5ea170e35.tar.lz
yuzu-94c34f23d7ba951e5f2b3afa7f1ad5a5ea170e35.tar.xz
yuzu-94c34f23d7ba951e5f2b3afa7f1ad5a5ea170e35.tar.zst
yuzu-94c34f23d7ba951e5f2b3afa7f1ad5a5ea170e35.zip
Diffstat (limited to 'src/yuzu_cmd/yuzu.cpp')
-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;
}