From 8e4f7d84cb948ab6920d27058e87b99f26d3bd18 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sun, 21 Jan 2018 23:01:26 +0100 Subject: [PATCH] The joystick configuration buttons in Settings now get the selected joystick ID from the correct combo box. --- src/win/win_settings.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/win/win_settings.c b/src/win/win_settings.c index d1ba0ec2a..14478d20b 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -8,7 +8,7 @@ * * Windows 86Box Settings dialog handler. * - * Version: @(#)win_settings.c 1.0.30 2018/01/21 + * Version: @(#)win_settings.c 1.0.31 2018/01/21 * * Author: Miran Grca, * @@ -1044,25 +1044,25 @@ win_settings_input_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) break; case IDC_JOY1: - h = GetDlgItem(hdlg, IDC_COMBO_JOY); + h = GetDlgItem(hdlg, IDC_COMBO_JOYSTICK); temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0); temp_deviceconfig |= joystickconfig_open(hdlg, 0, temp_joystick); break; case IDC_JOY2: - h = GetDlgItem(hdlg, IDC_COMBO_JOY); + h = GetDlgItem(hdlg, IDC_COMBO_JOYSTICK); temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0); temp_deviceconfig |= joystickconfig_open(hdlg, 1, temp_joystick); break; case IDC_JOY3: - h = GetDlgItem(hdlg, IDC_COMBO_JOY); + h = GetDlgItem(hdlg, IDC_COMBO_JOYSTICK); temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0); temp_deviceconfig |= joystickconfig_open(hdlg, 2, temp_joystick); break; case IDC_JOY4: - h = GetDlgItem(hdlg, IDC_COMBO_JOY); + h = GetDlgItem(hdlg, IDC_COMBO_JOYSTICK); temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0); temp_deviceconfig |= joystickconfig_open(hdlg, 3, temp_joystick); break;