citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #3333 from Senjosei/pause-coreerror 

citra_qt: Pause emulation on CoreError
This commit is contained in:
bunnei 2018-01-10 12:16:51 -05:00 committed by GitHub
parent 80025792d6 fb72a9d9fa
commit 2e41810608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/citra_qt/bootmanager.cpp
View File

@ -36,6 +36,7 @@ void EmuThread::run() {
Core::System::ResultStatus result = Core::System::GetInstance().RunLoop(); Core::System::ResultStatus result = Core::System::GetInstance().RunLoop();
if (result != Core::System::ResultStatus::Success) { if (result != Core::System::ResultStatus::Success) {
this->SetRunning(false);
emit ErrorThrown(result, Core::System::GetInstance().GetStatusDetails()); emit ErrorThrown(result, Core::System::GetInstance().GetStatusDetails());
} }

1
src/citra_qt/main.cpp
View File

@ -974,6 +974,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
} else { } else {
// Only show the message if the game is still running. // Only show the message if the game is still running.
if (emu_thread) { if (emu_thread) {
emu_thread->SetRunning(true);
message_label->setText(status_message); message_label->setText(status_message);
message_label->setVisible(true); message_label->setVisible(true);
} }