let games gracefully exit
This commit is contained in:
parent
339a37f8cb
commit
f44c60321e
|
@ -80,6 +80,11 @@ void EmuThread::run() {
|
|||
|
||||
system.GetCpuManager().OnGpuReady();
|
||||
|
||||
system.RegisterExitCallback([this]() {
|
||||
stop_source.request_stop();
|
||||
SetRunning(false);
|
||||
});
|
||||
|
||||
// Holds whether the cpu was running during the last iteration,
|
||||
// so that the DebugModeLeft signal can be emitted before the
|
||||
// next execution step
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include <QImage>
|
||||
#include <QStringList>
|
||||
#include <QThread>
|
||||
#include <QTimer>
|
||||
#include <QTouchEvent>
|
||||
#include <QWidget>
|
||||
|
||||
|
@ -87,6 +88,15 @@ public:
|
|||
* Requests for the emulation thread to stop running
|
||||
*/
|
||||
void RequestStop() {
|
||||
QTimer::singleShot(5000, this, &EmuThread::ForceStop);
|
||||
}
|
||||
|
||||
private slots:
|
||||
void ForceStop() {
|
||||
if (!IsRunning()) {
|
||||
return;
|
||||
}
|
||||
LOG_WARNING(Frontend, "Force stopping EmuThread");
|
||||
stop_source.request_stop();
|
||||
SetRunning(false);
|
||||
}
|
||||
|
|
|
@ -1707,9 +1707,6 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t
|
|||
system->RegisterExecuteProgramCallback(
|
||||
[this](std::size_t program_index_) { render_window->ExecuteProgram(program_index_); });
|
||||
|
||||
// Register an Exit callback such that Core can exit the currently running application.
|
||||
system->RegisterExitCallback([this]() { render_window->Exit(); });
|
||||
|
||||
connect(render_window, &GRenderWindow::Closed, this, &GMainWindow::OnStopGame);
|
||||
connect(render_window, &GRenderWindow::MouseActivity, this, &GMainWindow::OnMouseActivity);
|
||||
// BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views
|
||||
|
@ -1793,6 +1790,8 @@ void GMainWindow::ShutdownGame() {
|
|||
system->SetShuttingDown(true);
|
||||
system->DetachDebugger();
|
||||
discord_rpc->Pause();
|
||||
|
||||
RequestGameExit();
|
||||
emu_thread->RequestStop();
|
||||
|
||||
emit EmulationStopping();
|
||||
|
|
Reference in New Issue