Merge pull request #2100 from wwylele/fix-load-assert

Qt: shutdown system if error on loading ROM

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