ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Check for initialized GCPad before resetting rumble

This commit is contained in:
spycrab 2018-03-27 16:24:36 +02:00
parent ceed6890df
commit 016ef43b27
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Core.cpp
View File

@ -250,6 +250,8 @@ static void ResetRumble()
GCAdapter::ResetRumble(); GCAdapter::ResetRumble();
#endif #endif
#if defined(CIFACE_USE_XINPUT) || defined(CIFACE_USE_DINPUT) #if defined(CIFACE_USE_XINPUT) || defined(CIFACE_USE_DINPUT)
if (!Pad::IsInitialized())
return;
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)
Pad::ResetRumble(i); Pad::ResetRumble(i);
#endif #endif

5
Source/Core/Core/HW/GCPad.cpp
View File

@ -45,6 +45,11 @@ void LoadConfig()
s_config.LoadConfig(true); s_config.LoadConfig(true);
} }
bool IsInitialized()
{
return !s_config.ControllersNeedToBeCreated();
}
GCPadStatus GetStatus(int pad_num) GCPadStatus GetStatus(int pad_num)
{ {
return static_cast<GCPad*>(s_config.GetController(pad_num))->GetInput(); return static_cast<GCPad*>(s_config.GetController(pad_num))->GetInput();

1
Source/Core/Core/HW/GCPad.h
View File

@ -21,6 +21,7 @@ namespace Pad
void Shutdown(); void Shutdown();
void Initialize(); void Initialize();
void LoadConfig(); void LoadConfig();
bool IsInitialized();
InputConfig* GetConfig(); InputConfig* GetConfig();