From e34a8baa82a41bf3926b700b87ad8f65aa15a76a Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Sat, 3 Jul 2010 16:47:49 +0000
Subject: [PATCH] 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
---
 Source/Core/Common/Src/DynamicLibrary.cpp | 2 --
 Source/Core/Core/Src/PluginManager.cpp    | 9 ++++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Common/Src/DynamicLibrary.cpp b/Source/Core/Common/Src/DynamicLibrary.cpp
index 3ca0b58f8f..95ec340e71 100644
--- a/Source/Core/Common/Src/DynamicLibrary.cpp
+++ b/Source/Core/Common/Src/DynamicLibrary.cpp
@@ -85,8 +85,6 @@ int DynamicLibrary::Load(const char* filename)
 	DEBUG_LOG(COMMON, "DL: LoadLibrary: %s(%p)", filename, library);
 
 	if (!library) {
-		fprintf(stderr, "DL: Error loading DLL %s: %s", filename, 
-				  DllGetLastError());
 		ERROR_LOG(COMMON, "DL: Error loading DLL %s: %s", filename, 
 				  DllGetLastError());
 		return 0;
diff --git a/Source/Core/Core/Src/PluginManager.cpp b/Source/Core/Core/Src/PluginManager.cpp
index ac5b09e6b8..54e6a10434 100644
--- a/Source/Core/Core/Src/PluginManager.cpp
+++ b/Source/Core/Core/Src/PluginManager.cpp
@@ -420,13 +420,16 @@ void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename, PLUGIN_TY
 	switch(Type)
 	{
 	case PLUGIN_TYPE_VIDEO:
-		GetVideo()->Config((HWND)_Parent);
+		if (GetVideo() != NULL)
+			GetVideo()->Config((HWND)_Parent);
 		break;
 	case PLUGIN_TYPE_DSP:
-		GetDSP()->Config((HWND)_Parent);
+		if (GetDSP() != NULL)
+			GetDSP()->Config((HWND)_Parent);
 		break;
 	case PLUGIN_TYPE_WIIMOTE:
-		GetWiimote()->Config((HWND)_Parent);
+		if (GetWiimote() != NULL)
+			GetWiimote()->Config((HWND)_Parent);
 		break;
 	default:
 		PanicAlert("Type %d config not supported in plugin %s", Type, _rFilename);