diff options
| author | bunnei <bunneidev@gmail.com> | 2016-09-23 05:06:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 05:06:57 +0200 |
| commit | 0c8df1046f789c9f965300c54d03004fc0b8721e (patch) | |
| tree | 7dbc0d9a2d088ad6433d8cfd420cf9a77696f658 | |
| parent | Merge pull request #2099 from citra-emu/fix-clang-format (diff) | |
| parent | qt: shutdown system if error (diff) | |
| download | yuzu-0c8df1046f789c9f965300c54d03004fc0b8721e.tar yuzu-0c8df1046f789c9f965300c54d03004fc0b8721e.tar.gz yuzu-0c8df1046f789c9f965300c54d03004fc0b8721e.tar.bz2 yuzu-0c8df1046f789c9f965300c54d03004fc0b8721e.tar.lz yuzu-0c8df1046f789c9f965300c54d03004fc0b8721e.tar.xz yuzu-0c8df1046f789c9f965300c54d03004fc0b8721e.tar.zst yuzu-0c8df1046f789c9f965300c54d03004fc0b8721e.zip | |
| -rw-r--r-- | src/citra_qt/main.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 82667446b..0c7bedfcf 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -286,7 +286,6 @@ bool GMainWindow::LoadROM(const std::string& filename) { Loader::ResultStatus result = app_loader->Load(); if (Loader::ResultStatus::Success != result) { LOG_CRITICAL(Frontend, "Failed to load ROM!"); - System::Shutdown(); switch (result) { case Loader::ResultStatus::ErrorEncrypted: { @@ -326,8 +325,10 @@ void GMainWindow::BootGame(const std::string& filename) { if (!InitializeSystem()) return; - if (!LoadROM(filename)) + if (!LoadROM(filename)) { + System::Shutdown(); return; + } // Create and start the emulation thread emu_thread = std::make_unique<EmuThread>(render_window); |