forgot include

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1986 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/Core/Src/InputManager.h

@@ -1,5 +1,10 @@
 #ifndef INPUTMANAGER_H
 #define INPUTMANAGER_H
+#include "Common.h"
+
+#if defined HAVE_SDL && HAVE_SDL
+#include <SDL.h>
+#endif
 
 class InputManager {
 

Source/Core/Core/Src/PluginManager.cpp

@@ -257,9 +257,11 @@ void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename)
 {
 
     Common::CPlugin *plugin = new Common::CPlugin(_rFilename);
+    m_InputManager->Init();
     plugin->SetGlobals(m_PluginGlobals);
     plugin->Config((HWND)_Parent);
     delete plugin;
+    m_InputManager->Shutdown();
 }
 
 // ----------------------------------------

Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp

@@ -258,12 +258,9 @@ int Search_Devices()
 	if (joyinfo)
 	{
 		delete [] joyinfo;
-		joyinfo = new CONTROLLER_INFO [numjoy];
 	}
-	else
+
-	{
 	joyinfo = new CONTROLLER_INFO [numjoy];
-	}
 
 	// Warn the user if no PadMapping are detected
 	if (numjoy == 0)
@@ -327,8 +324,10 @@ void Shutdown()
     DEBUG_QUIT();
 #endif
     
+    if(joyinfo) {
 	delete [] joyinfo;
 	joyinfo = NULL;
+    }
     
     emulator_running = false;
     

Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp

@@ -231,8 +231,10 @@ void Shutdown()
     DEBUG_QUIT();
 #endif
     
+    if (joyinfo) {
 	delete [] joyinfo;
-
+	joyinfo = NULL;
+    }
     emulator_running = FALSE;
     
 #ifdef _WIN32