summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorN00byKing <N00byKing@users.noreply.github.com>2018-01-16 17:32:27 +0100
committerbunnei <bunneidev@gmail.com>2018-01-16 17:32:27 +0100
commit8b097aa17e598fa1d1075ea1e7512925ec423524 (patch)
tree200868128f3e0d54e5bb32cee0eb62a9461f584b
parentMerge pull request #24 from nkatz565/nk-inputs (diff)
downloadyuzu-8b097aa17e598fa1d1075ea1e7512925ec423524.tar
yuzu-8b097aa17e598fa1d1075ea1e7512925ec423524.tar.gz
yuzu-8b097aa17e598fa1d1075ea1e7512925ec423524.tar.bz2
yuzu-8b097aa17e598fa1d1075ea1e7512925ec423524.tar.lz
yuzu-8b097aa17e598fa1d1075ea1e7512925ec423524.tar.xz
yuzu-8b097aa17e598fa1d1075ea1e7512925ec423524.tar.zst
yuzu-8b097aa17e598fa1d1075ea1e7512925ec423524.zip
-rw-r--r--src/yuzu/bootmanager.cpp1
-rw-r--r--src/yuzu/main.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index a1e0cf575..843ac6ad7 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -40,6 +40,7 @@ void EmuThread::run() {
Core::System::ResultStatus result = Core::System::GetInstance().RunLoop();
if (result != Core::System::ResultStatus::Success) {
+ this->SetRunning(false);
emit ErrorThrown(result, Core::System::GetInstance().GetStatusDetails());
}
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 51d7f9418..7c711158a 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -726,6 +726,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
} else {
// Only show the message if the game is still running.
if (emu_thread) {
+ emu_thread->SetRunning(true);
message_label->setText(status_message);
message_label->setVisible(true);
}