From 3aa047cd1d2b1fa4be28b3352065cb183eed635c Mon Sep 17 00:00:00 2001
From: wwylele <wwylele@gmail.com>
Date: Thu, 22 Sep 2016 16:40:33 +0800
Subject: [PATCH] qt: shutdown system if error
---
src/citra_qt/main.cpp | 5 +++--
1 file 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);