summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar wwylele2016-09-22 16:40:33 +0800
committerGravatar wwylele2016-09-22 16:40:33 +0800
commit3aa047cd1d2b1fa4be28b3352065cb183eed635c (patch)
tree7dbc0d9a2d088ad6433d8cfd420cf9a77696f658 /src
parentMerge pull request #2099 from citra-emu/fix-clang-format (diff)
downloadyuzu-3aa047cd1d2b1fa4be28b3352065cb183eed635c.tar.gz
yuzu-3aa047cd1d2b1fa4be28b3352065cb183eed635c.tar.xz
yuzu-3aa047cd1d2b1fa4be28b3352065cb183eed635c.zip
qt: shutdown system if error
Diffstat (limited to 'src')
-rw-r--r--src/citra_qt/main.cpp5
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) {
286 Loader::ResultStatus result = app_loader->Load(); 286 Loader::ResultStatus result = app_loader->Load();
287 if (Loader::ResultStatus::Success != result) { 287 if (Loader::ResultStatus::Success != result) {
288 LOG_CRITICAL(Frontend, "Failed to load ROM!"); 288 LOG_CRITICAL(Frontend, "Failed to load ROM!");
289 System::Shutdown();
290 289
291 switch (result) { 290 switch (result) {
292 case Loader::ResultStatus::ErrorEncrypted: { 291 case Loader::ResultStatus::ErrorEncrypted: {
@@ -326,8 +325,10 @@ void GMainWindow::BootGame(const std::string& filename) {
326 if (!InitializeSystem()) 325 if (!InitializeSystem())
327 return; 326 return;
328 327
329 if (!LoadROM(filename)) 328 if (!LoadROM(filename)) {
329 System::Shutdown();
330 return; 330 return;
331 }
331 332
332 // Create and start the emulation thread 333 // Create and start the emulation thread
333 emu_thread = std::make_unique<EmuThread>(render_window); 334 emu_thread = std::make_unique<EmuThread>(render_window);