Merge pull request #6540 from spycrab/gcpad_segfault

Core: Check for initialized GCPad before resetting rumble
dolphin-emu · Mar 27, 2018 · 92e7830 · 92e7830
2 parents 3c61ee5 + 016ef43
commit 92e7830
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
@@ -250,6 +250,8 @@ static void ResetRumble()
   GCAdapter::ResetRumble();
 #endif
 #if defined(CIFACE_USE_XINPUT) || defined(CIFACE_USE_DINPUT)
+  if (!Pad::IsInitialized())
+    return;
   for (int i = 0; i < 4; ++i)
     Pad::ResetRumble(i);
 #endif

diff --git a/Source/Core/Core/HW/GCPad.cpp b/Source/Core/Core/HW/GCPad.cpp
@@ -45,6 +45,11 @@ void LoadConfig()
   s_config.LoadConfig(true);
 }
 
+bool IsInitialized()
+{
+  return !s_config.ControllersNeedToBeCreated();
+}
+
 GCPadStatus GetStatus(int pad_num)
 {
   return static_cast<GCPad*>(s_config.GetController(pad_num))->GetInput();

diff --git a/Source/Core/Core/HW/GCPad.h b/Source/Core/Core/HW/GCPad.h
@@ -21,6 +21,7 @@ namespace Pad
 void Shutdown();
 void Initialize();
 void LoadConfig();
+bool IsInitialized();
 
 InputConfig* GetConfig();