Merge pull request #2896 from FearlessTobi/port-4950

Port citra-emu/citra#4950: "Add FPS to SDL title bar"

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;
 }