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

Temporary solution to prevent hanging when closing emulator when render to main fram is used. It may be related to issue 1080. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1195 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2008-11-17 13:01:41 +00:00
parent 39e44b0482
commit a88a644602
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/DynamicLibrary.cpp
View File

@ -26,6 +26,7 @@
#include "Common.h" #include "Common.h"
#include "StringUtil.h" #include "StringUtil.h"
#include "DynamicLibrary.h" #include "DynamicLibrary.h"
#include "../../Core/Src/PowerPC/PowerPC.h"
DynamicLibrary::DynamicLibrary() DynamicLibrary::DynamicLibrary()
{ {
@ -109,6 +110,7 @@ void DynamicLibrary::Unload()
} }
#ifdef _WIN32 #ifdef _WIN32
if( ! (library_file.find("OGL.") != std::string::npos) && !PowerPC::CPU_POWERDOWN)
FreeLibrary(library); FreeLibrary(library);
#else #else
dlclose(library); dlclose(library);

2
Source/Core/Core/Src/Core.cpp
View File

@ -189,7 +189,7 @@ void Stop() // - Hammertime!
PluginVideo::Video_Stop(); PluginVideo::Video_Stop();
#endif #endif
delete g_pThread; //Wait for emuthread to close //delete g_pThread; //Wait for emuthread to close
g_pThread = 0; g_pThread = 0;
Core::StopTrace(); Core::StopTrace();
LogManager::Shutdown(); LogManager::Shutdown();