summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2016-06-30 08:07:59 +0200
committerGitHub <noreply@github.com>2016-06-30 08:07:59 +0200
commitd81b635957450a85efbf25066f9ee517ef10ec3f (patch)
tree703ef7d3c19009345bd81d8ee5c6e3c01b377686 /platform
parent91655b9a18fdccaff9137af458add3778bf666e9 (diff)
parent2511f48339ab9fa489cf31e7c985547ddb69ae4e (diff)
Merge pull request #5495 from SuperUserNameMan/joystick_bug_windows
fixes #5464 windows_joystick close_joystick bug
Diffstat (limited to 'platform')
-rw-r--r--platform/windows/joystick.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/windows/joystick.cpp b/platform/windows/joystick.cpp
index 663bbe3b9b..e69bfe6a52 100644
--- a/platform/windows/joystick.cpp
+++ b/platform/windows/joystick.cpp
@@ -283,7 +283,7 @@ void joystick_windows::close_joystick(int id) {
d_joysticks[id].attached = false;
attached_joysticks[d_joysticks[id].id] = false;
d_joysticks[id].guid.Data1 = d_joysticks[id].guid.Data2 = d_joysticks[id].guid.Data3 = 0;
- input->joy_connection_changed(id, false, "");
+ input->joy_connection_changed(d_joysticks[id].id, false, "");
joystick_count--;
}