piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Join the emu thread in Core::Stop. Get rid of Core::Shutdown which did that before."

Browse Source 
This reverts commit ba664b3293.

Added documentation to Core::Shutdown() to prevent breaking changes.
This commit is contained in:
Jules Blok
2015-06-06 14:52:09 +02:00
parent 40162fdfc1
commit b6c4d5792b
5 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Core/Core.cpp
View File

@ -273,8 +273,6 @@ void Stop() // - Hammertime!
g_video_backend->Video_ExitLoop();
}
if (s_emu_thread.joinable())
s_emu_thread.join();
}
static void DeclareAsCPUThread()
@ -829,6 +827,18 @@ void UpdateTitle()
Host_UpdateTitle(SMessage);
}
void Shutdown()
{
// During shutdown DXGI expects us to handle some messages on the UI thread.
// Therefore we can't immediately block and wait for the emu thread to shut
// down, so we join the emu thread as late as possible when the UI has already
// shut down.
// For more info read "DirectX Graphics Infrastructure (DXGI): Best Practices"
// on MSDN.
if (s_emu_thread.joinable())
s_emu_thread.join();
}
void SetOnStoppedCallback(StoppedCallbackFunc callback)
{
s_on_stopped_callback = callback;

1
Source/Core/Core/Core.h
View File

@ -39,6 +39,7 @@ enum EState
bool Init();
void Stop();
void Shutdown();
std::string StopMessage(bool, const std::string&);