Skip to content
Snippets Groups Projects
Commit cd817be9 authored by Yuri Kunde Schlesner's avatar Yuri Kunde Schlesner
Browse files

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.
parent cc19a766
No related branches found
No related tags found
No related merge requests found
......@@ -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"));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment