ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11893 from JosJuice/dual-core-exit-assert 

Core: Declare emu thread as CPU thread while shutting down
This commit is contained in:
Admiral H. Curtiss 2023-06-06 18:36:51 +02:00 committed by GitHub
parent 38b033a476 6bd5473d56
commit e1a986b270
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/Core.cpp
View File

@ -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
{ {