godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add dinput nullptr checks.

This commit is contained in:
Marcel Admiraal 2020-05-29 16:39:58 +01:00
parent 240032ade7
commit bc49d34123
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/windows/joypad_windows.cpp
View File

@ -76,12 +76,16 @@ JoypadWindows::JoypadWindows(HWND *hwnd) {
ERR_PRINT("The Windows DirectInput subsystem could not allocate sufficient memory."); ERR_PRINT("The Windows DirectInput subsystem could not allocate sufficient memory.");
ERR_PRINT("Rebooting your PC may solve this issue."); ERR_PRINT("Rebooting your PC may solve this issue.");
} }
// Ensure dinput is still a nullptr.
dinput = nullptr;
} }
} }
JoypadWindows::~JoypadWindows() { JoypadWindows::~JoypadWindows() {
close_joypad(); close_joypad();
if (dinput) {
dinput->Release(); dinput->Release();
}
unload_xinput(); unload_xinput();
} }
@ -139,6 +143,7 @@ bool JoypadWindows::is_xinput_device(const GUID *p_guid) {
} }
bool JoypadWindows::setup_dinput_joypad(const DIDEVICEINSTANCE *instance) { bool JoypadWindows::setup_dinput_joypad(const DIDEVICEINSTANCE *instance) {
ERR_FAIL_NULL_V_MSG(dinput, false, "DirectInput not initialized. Rebooting your PC may solve this issue.");
HRESULT hr; HRESULT hr;
int num = input->get_unused_joy_id(); int num = input->get_unused_joy_id();
@ -270,6 +275,7 @@ void JoypadWindows::close_joypad(int id) {
} }
void JoypadWindows::probe_joypads() { void JoypadWindows::probe_joypads() {
ERR_FAIL_NULL_MSG(dinput, "DirectInput not initialized. Rebooting your PC may solve this issue.");
DWORD dwResult; DWORD dwResult;
for (DWORD i = 0; i < XUSER_MAX_COUNT; i++) { for (DWORD i = 0; i < XUSER_MAX_COUNT; i++) {
ZeroMemory(&x_joypads[i].state, sizeof(XINPUT_STATE)); ZeroMemory(&x_joypads[i].state, sizeof(XINPUT_STATE));