mirror of
https://github.com/citra-emu/citra-nightly.git
synced 2024-12-27 22:55:43 +00:00
citra-qt: Move system shutdown to run inside EmuThread
This stops (for some reason sporadic) crashes and OpenGL errors during shutdown, when the OpenGL renderer tries to clean up objects from the UI thread, which has no OpenGL context active.
This commit is contained in:
parent
cc19a76656
commit
cd817be922
|
@ -72,6 +72,9 @@ void EmuThread::run() {
|
|||
}
|
||||
}
|
||||
|
||||
// Shutdown the core emulation
|
||||
System::Shutdown();
|
||||
|
||||
MicroProfileOnThreadExit();
|
||||
|
||||
render_window->moveContext();
|
||||
|
|
|
@ -283,9 +283,6 @@ void GMainWindow::ShutdownGame() {
|
|||
emu_thread->wait();
|
||||
emu_thread = nullptr;
|
||||
|
||||
// Shutdown the core emulation
|
||||
System::Shutdown();
|
||||
|
||||
// Update the GUI
|
||||
ui.action_Start->setEnabled(false);
|
||||
ui.action_Start->setText(tr("Start"));
|
||||
|
|
Loading…
Reference in a new issue