From 8bd78a21b4eca9efae8cab2c83f10b9549a58b04 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Sun, 31 Aug 2008 06:53:23 +0000 Subject: [PATCH] Fix Pad_DX9 crash git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@398 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/HW/SerialInterface.cpp | 2 +- Source/Core/Core/Src/Plugins/Plugin_PAD.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/HW/SerialInterface.cpp b/Source/Core/Core/Src/HW/SerialInterface.cpp index 24b0b9c7fc..ac33eb92fd 100644 --- 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)) diff --git a/Source/Core/Core/Src/Plugins/Plugin_PAD.cpp b/Source/Core/Core/Src/Plugins/Plugin_PAD.cpp index e187c23631..ccb682fda1 100644 --- 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; }