mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-10 16:19:28 +01:00
Core: Declare emu thread as CPU thread while shutting down
Fixes https://bugs.dolphin-emu.org/issues/13274.
This commit is contained in:
parent
2d56daf1bb
commit
6bd5473d56
@ -679,6 +679,10 @@ static void EmuThread(std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi
|
|||||||
// Join with the CPU thread.
|
// Join with the CPU thread.
|
||||||
s_cpu_thread.join();
|
s_cpu_thread.join();
|
||||||
INFO_LOG_FMT(CONSOLE, "{}", StopMessage(true, "CPU thread stopped."));
|
INFO_LOG_FMT(CONSOLE, "{}", StopMessage(true, "CPU thread stopped."));
|
||||||
|
|
||||||
|
// Redeclare this thread as the CPU thread, so that the code running in the scope guards doesn't
|
||||||
|
// think we're doing anything unsafe by doing stuff that could race with the CPU thread.
|
||||||
|
DeclareAsCPUThread();
|
||||||
}
|
}
|
||||||
else // SingleCore mode
|
else // SingleCore mode
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user