diff --git a/Source/Core/Common/Src/DynamicLibrary.cpp b/Source/Core/Common/Src/DynamicLibrary.cpp index 320b9a198e..b8fa470705 100644 --- a/Source/Core/Common/Src/DynamicLibrary.cpp +++ b/Source/Core/Common/Src/DynamicLibrary.cpp @@ -26,6 +26,7 @@ #include "Common.h" #include "StringUtil.h" #include "DynamicLibrary.h" +#include "../../Core/Src/PowerPC/PowerPC.h" DynamicLibrary::DynamicLibrary() { @@ -109,6 +110,7 @@ void DynamicLibrary::Unload() } #ifdef _WIN32 + if( ! (library_file.find("OGL.") != std::string::npos) && !PowerPC::CPU_POWERDOWN) FreeLibrary(library); #else dlclose(library); diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 27cf0e47ab..131beba498 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -189,7 +189,7 @@ void Stop() // - Hammertime! PluginVideo::Video_Stop(); #endif - delete g_pThread; //Wait for emuthread to close + //delete g_pThread; //Wait for emuthread to close g_pThread = 0; Core::StopTrace(); LogManager::Shutdown();