piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues 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
parent 96b77aaa81 5535c5c54c
commit fbd5bb815c
5 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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();