asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add dinput nullptr checks.

Browse source 
(cherry picked from commit bc49d34123)
This commit is contained in:
Marcel Admiraal 2020-05-29 16:39:58 +01:00 committed by Rémi Verschelde
parent 6c9c6885a2
commit 91590b0cf0
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,13 +76,17 @@ JoypadWindows::JoypadWindows(InputDefault *_input, 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();
} }
@ -146,6 +150,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();
@ -284,6 +289,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++) {