piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2538 from Armada651/thread-revert

Browse Source 
Revert "Join the emu thread in Core::Stop. Get rid of Core::Shutdown which did that before."
This commit is contained in:
Jules Blok 2015-07-25 13:02:04 +02:00
commit fbd5bb815c
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/Core.cpp
View File

@ -162,7 +162,7 @@ void DisplayMessage(const std::string& message, int time_in_ms)
bool IsRunning()
{
return (GetState() != CORE_UNINITIALIZED) || s_hardware_initialized;
return (GetState() != CORE_UNINITIALIZED || s_hardware_initialized) && !s_is_stopping;
}
bool IsRunningAndStarted()
@ -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&);

1
Source/Core/DolphinWX/Main.cpp
View File

@ -370,6 +370,7 @@ void DolphinApp::OnEndSession(wxCloseEvent& event)
int DolphinApp::OnExit()
{
Core::Shutdown();
UICommon::Shutdown();
delete m_locale;

1
Source/Core/DolphinWX/MainAndroid.cpp
View File

@ -627,6 +627,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv *
updateMainFrameEvent.Wait();
}
Core::Shutdown();
UICommon::Shutdown();
ANativeWindow_release(surf);

1
Source/Core/DolphinWX/MainNoGUI.cpp
View File

@ -358,6 +358,7 @@ int main(int argc, char* argv[])
while (PowerPC::GetState() != PowerPC::CPU_POWERDOWN)
updateMainFrameEvent.Wait();
Core::Shutdown();
platform->Shutdown();
UICommon::Shutdown();