claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The joystick configuration buttons in Settings now get the selected joystick ID from the correct combo box.

Browse Source
This commit is contained in:
OBattler
2018-01-21 23:01:26 +01:00
parent 29e662bfe3
commit 8e4f7d84cb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/win/win_settings.c
View File

@@ -8,7 +8,7 @@
* *
* Windows 86Box Settings dialog handler. * 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, <mgrca8@gmail.com> * Author: Miran Grca, <mgrca8@gmail.com>
* *
@@ -1044,25 +1044,25 @@ win_settings_input_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
break; break;
case IDC_JOY1: case IDC_JOY1:
h = GetDlgItem(hdlg, IDC_COMBO_JOY); h = GetDlgItem(hdlg, IDC_COMBO_JOYSTICK);
temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0); temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0);
temp_deviceconfig |= joystickconfig_open(hdlg, 0, temp_joystick); temp_deviceconfig |= joystickconfig_open(hdlg, 0, temp_joystick);
break; break;
case IDC_JOY2: case IDC_JOY2:
h = GetDlgItem(hdlg, IDC_COMBO_JOY); h = GetDlgItem(hdlg, IDC_COMBO_JOYSTICK);
temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0); temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0);
temp_deviceconfig |= joystickconfig_open(hdlg, 1, temp_joystick); temp_deviceconfig |= joystickconfig_open(hdlg, 1, temp_joystick);
break; break;
case IDC_JOY3: case IDC_JOY3:
h = GetDlgItem(hdlg, IDC_COMBO_JOY); h = GetDlgItem(hdlg, IDC_COMBO_JOYSTICK);
temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0); temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0);
temp_deviceconfig |= joystickconfig_open(hdlg, 2, temp_joystick); temp_deviceconfig |= joystickconfig_open(hdlg, 2, temp_joystick);
break; break;
case IDC_JOY4: case IDC_JOY4:
h = GetDlgItem(hdlg, IDC_COMBO_JOY); h = GetDlgItem(hdlg, IDC_COMBO_JOYSTICK);
temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0); temp_joystick = SendMessage(h, CB_GETCURSEL, 0, 0);
temp_deviceconfig |= joystickconfig_open(hdlg, 3, temp_joystick); temp_deviceconfig |= joystickconfig_open(hdlg, 3, temp_joystick);
break; break;