From a666ff87c001b5b7d6d3447a5ec4c2f3c18ab941 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Sun, 30 Jan 2022 22:06:18 -0500
Subject: [PATCH] Less confusion for midi out

---
 src/include/86box/resource.h | 4 ++--
 src/win/languages/dialogs.rc | 4 ++--
 src/win/win_settings.c       | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h
index 5eb188420..eda3c2418 100644
--- a/src/include/86box/resource.h
+++ b/src/include/86box/resource.h
@@ -154,7 +154,7 @@
 #define IDC_CHECK_SSI		1042
 #define IDC_CHECK_CMS		1043
 #define IDC_CHECK_GUS		1044
-#define IDC_COMBO_MIDI		1045
+#define IDC_COMBO_MIDI_OUT	1045
 #define IDC_CHECK_MPU401	1046
 #define IDC_CONFIGURE_MPU401	1047
 #define IDC_CHECK_FLOAT		1048
@@ -281,7 +281,7 @@
 #define  IDC_CONFIGURE_BUSLOGIC	1305
 #define  IDC_CONFIGURE_PCAP	1306
 #define  IDC_CONFIGURE_NET	1307
-#define  IDC_CONFIGURE_MIDI	1308
+#define  IDC_CONFIGURE_MIDI_OUT	1308
 #define  IDC_CONFIGURE_MIDI_IN 1309
 #define  IDC_JOY1		1310
 #define  IDC_JOY2		1311
diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc
index a92a95d1b..c6934b398 100644
--- a/src/win/languages/dialogs.rc
+++ b/src/win/languages/dialogs.rc
@@ -169,10 +169,10 @@ BEGIN
     LTEXT           STR_SOUND,IDT_1711,7,9,59,10
     PUSHBUTTON      STR_CONFIGURE,IDC_CONFIGURE_SND,214,7,46,12
 
-    COMBOBOX        IDC_COMBO_MIDI,71,26,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | 
+    COMBOBOX        IDC_COMBO_MIDI_OUT,71,26,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
     LTEXT           STR_MIDI,IDT_1712,7,28,59,10
-    PUSHBUTTON      STR_CONFIGURE,IDC_CONFIGURE_MIDI,214,26,46,12
+    PUSHBUTTON      STR_CONFIGURE,IDC_CONFIGURE_MIDI_OUT,214,26,46,12
 
     COMBOBOX        IDC_COMBO_MIDI_IN,71,45,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index 69b4afbe3..9f72b4f9d 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -1346,7 +1346,7 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 			c++;
 		}
 
-		settings_enable_window(hdlg, IDC_CONFIGURE_MIDI, midi_device_has_config(temp_midi_device));
+		settings_enable_window(hdlg, IDC_CONFIGURE_MIDI_OUT, midi_device_has_config(temp_midi_device));
 
 		c = d = 0;
 		settings_reset_content(hdlg, IDC_COMBO_MIDI_IN);
@@ -1406,13 +1406,13 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 
 			case IDC_COMBO_MIDI:
 				temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI)];
-				settings_enable_window(hdlg, IDC_CONFIGURE_MIDI, midi_device_has_config(temp_midi_device));
+				settings_enable_window(hdlg, IDC_CONFIGURE_MIDI_OUT, midi_device_has_config(temp_midi_device));
 				settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
 				settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
 				settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
 				break;
 
-			case IDC_CONFIGURE_MIDI:
+			case IDC_CONFIGURE_MIDI_OUT:
 				temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI)];
 				temp_deviceconfig |= deviceconfig_open(hdlg, (void *)midi_device_getdevice(temp_midi_device));
 				break;