Merge pull request #6540 from spycrab/gcpad_segfault
Core: Check for initialized GCPad before resetting rumble
This commit is contained in:
commit
92e7830be9
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -21,6 +21,7 @@ namespace Pad
|
|||
void Shutdown();
|
||||
void Initialize();
|
||||
void LoadConfig();
|
||||
bool IsInitialized();
|
||||
|
||||
InputConfig* GetConfig();
|
||||
|
||||
|
|
Loading…
Reference in New Issue