summaryrefslogtreecommitdiff
path: root/platform/windows/joypad.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-09-12 11:57:49 +0200
committerGitHub <noreply@github.com>2017-09-12 11:57:49 +0200
commitcf941fdc357791a93bd9ab9eaf16898e0c218ff3 (patch)
tree546d046bffd826359c85240ae4562ef5df734e86 /platform/windows/joypad.cpp
parent84ccda4e1d6f9a63b689167887f7d329cdc5dffa (diff)
parent8230bf0a2f39f0849b670d26067207c45edcca1a (diff)
Merge pull request #11026 from hpvb/fix-assign-in-if
Remove assignment and declarations in if statements
Diffstat (limited to 'platform/windows/joypad.cpp')
-rw-r--r--platform/windows/joypad.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/windows/joypad.cpp b/platform/windows/joypad.cpp
index 00cfa812de..0c7358f499 100644
--- a/platform/windows/joypad.cpp
+++ b/platform/windows/joypad.cpp
@@ -379,7 +379,9 @@ void JoypadWindows::process_joypads() {
IDirectInputDevice8_Acquire(joy->di_joy);
joy->di_joy->Poll();
}
- if (FAILED(hr = joy->di_joy->GetDeviceState(sizeof(DIJOYSTATE2), &js))) {
+
+ hr = joy->di_joy->GetDeviceState(sizeof(DIJOYSTATE2), &js);
+ if (FAILED(hr)) {
//printf("failed to read joy #%d\n", i);
continue;