Fix Pad_DX9 crash

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@398 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 06:53:23 +00:00 · 2008-08-31 06:53:23 +00:00 · 8bd78a21b4
parent af60e06bb0
commit 8bd78a21b4
2 changed files with 1 additions and 2 deletions
--- a/Source/Core/Core/Src/HW/SerialInterface.cpp
+++ b/Source/Core/Core/Src/HW/SerialInterface.cpp
@ -241,7 +241,7 @@ void Init()
 		g_Channel[i].m_InLo.Hex = 0;		
 	}	

-	unsigned int AttachedPadMask = PluginPAD::PAD_GetAttachedPads();
+	unsigned int AttachedPadMask = PluginPAD::PAD_GetAttachedPads ? PluginPAD::PAD_GetAttachedPads() : 1;
 	for (int i = 0; i < 4; i++)
 	{
 		if (AttachedPadMask & (1 << i))
--- a/Source/Core/Core/Src/Plugins/Plugin_PAD.cpp
+++ b/Source/Core/Core/Src/Plugins/Plugin_PAD.cpp
@ -71,7 +71,6 @@ bool LoadPlugin(const char *_Filename)
 			(PAD_Initialize != 0) &&
 			(PAD_Shutdown != 0) &&
 			(PAD_GetStatus != 0))
-			//(PAD_Rumble != 0))
 		{
 			return true;
 		}