summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd/yuzu.cpp
diff options
context:
space:
mode:
authorGravatar jroweboy2019-09-22 15:40:57 +0200
committerGravatar FearlessTobi2019-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.gz
yuzu-64dbc92b614bfa388d31007788bf725c4e4b59e3.tar.xz
yuzu-64dbc92b614bfa388d31007788bf725c4e4b59e3.zip
Add FPS to SDL title bar
Also fix a small issue with incorrect shutdown ordering in SDL. Previously the system would still be running so the telemetry task didn't launch and detached_tasks would assert(count == 0)
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) {
186 system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>()); 186 system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>());
187 system.GetFileSystemController().CreateFactories(*system.GetFilesystem()); 187 system.GetFileSystemController().CreateFactories(*system.GetFilesystem());
188 188
189 SCOPE_EXIT({ system.Shutdown(); });
190
191 const Core::System::ResultStatus load_result{system.Load(*emu_window, filepath)}; 189 const Core::System::ResultStatus load_result{system.Load(*emu_window, filepath)};
192 190
193 switch (load_result) { 191 switch (load_result) {
@@ -227,6 +225,8 @@ int main(int argc, char** argv) {
227 system.RunLoop(); 225 system.RunLoop();
228 } 226 }
229 227
228 system.Shutdown();
229
230 detached_tasks.WaitForAllTasks(); 230 detached_tasks.WaitForAllTasks();
231 return 0; 231 return 0;
232} 232}