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

Fix a segmentation fault when attempting to load an invalid plugin. 

Removed an erroneous fprintf.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5828 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-07-03 16:47:49 +00:00
parent 2ed8a4331e
commit e34a8baa82
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,8 +85,6 @@ int DynamicLibrary::Load(const char* filename)
DEBUG_LOG(COMMON, "DL: LoadLibrary: %s(%p)", filename, library); DEBUG_LOG(COMMON, "DL: LoadLibrary: %s(%p)", filename, library);
if (!library) { if (!library) {
fprintf(stderr, "DL: Error loading DLL %s: %s", filename,
DllGetLastError());
ERROR_LOG(COMMON, "DL: Error loading DLL %s: %s", filename, ERROR_LOG(COMMON, "DL: Error loading DLL %s: %s", filename,
DllGetLastError()); DllGetLastError());
return 0; return 0;

3
Source/Core/Core/Src/PluginManager.cpp
View File

@ -420,12 +420,15 @@ void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename, PLUGIN_TY
switch(Type) switch(Type)
{ {
case PLUGIN_TYPE_VIDEO: case PLUGIN_TYPE_VIDEO:
if (GetVideo() != NULL)
GetVideo()->Config((HWND)_Parent); GetVideo()->Config((HWND)_Parent);
break; break;
case PLUGIN_TYPE_DSP: case PLUGIN_TYPE_DSP:
if (GetDSP() != NULL)
GetDSP()->Config((HWND)_Parent); GetDSP()->Config((HWND)_Parent);
break; break;
case PLUGIN_TYPE_WIIMOTE: case PLUGIN_TYPE_WIIMOTE:
if (GetWiimote() != NULL)
GetWiimote()->Config((HWND)_Parent); GetWiimote()->Config((HWND)_Parent);
break; break;
default: default: