From c6603a211582d2b26f1c809531297613e3ce920b Mon Sep 17 00:00:00 2001
From: Dimitris Panokostas <midwan@gmail.com>
Date: Mon, 3 Mar 2025 22:49:53 +0100
Subject: [PATCH] bugfix: Fixed selecting custom SCSI Rom did not work (fixes
 #1641)

---
 src/osdep/gui/PanelExpansions.cpp | 81 ++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 33 deletions(-)

diff --git a/src/osdep/gui/PanelExpansions.cpp b/src/osdep/gui/PanelExpansions.cpp
index 4d7bc2a7..e8ff1f7f 100644
--- a/src/osdep/gui/PanelExpansions.cpp
+++ b/src/osdep/gui/PanelExpansions.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <cstdio>
 #include <cstdlib>
 
@@ -140,8 +141,8 @@ static void enable_for_expansion2dlg()
 
 static void setcpuboardmemsize()
 {
-	if (changed_prefs.cpuboardmem1.size > cpuboard_maxmemory(&changed_prefs))
-		changed_prefs.cpuboardmem1.size = cpuboard_maxmemory(&changed_prefs);
+	changed_prefs.cpuboardmem1.size = std::min<uae_u32>(changed_prefs.cpuboardmem1.size,
+	                                                    cpuboard_maxmemory(&changed_prefs));
 
 	if (cpuboard_memorytype(&changed_prefs) == BOARD_MEMORY_Z2) {
 		changed_prefs.fastmem[0].size = changed_prefs.cpuboardmem1.size;
@@ -418,6 +419,33 @@ static const int scsiromselectedmask[] = {
 	EXPANSIONTYPE_SOUND, EXPANSIONTYPE_NET, EXPANSIONTYPE_FLOPPY, EXPANSIONTYPE_X86_EXPANSION
 };
 
+static void init_expansion_scsi_id()
+{
+	int index;
+	boardromconfig* brc = get_device_rom(&changed_prefs, static_cast<int>(expansionroms[scsiromselected].romtype), scsiromselectednum, &index);
+	const expansionromtype* ert = &expansionroms[scsiromselected];
+	if (brc && ert && ert->id_jumper) {
+		if (scsi_romid_list.getNumberOfElements() < 8) {
+			scsi_romid_list.clear();
+			for (int i = 0; i < 8; i++) {
+				TCHAR tmp[10];
+				_sntprintf(tmp, sizeof tmp, _T("%d"), i);
+				scsi_romid_list.add(tmp);
+			}
+		}
+		cboScsiRomId->setSelected(brc->roms[index].device_id);
+		cboScsiRomId->setEnabled(true);
+	}
+	else {
+		if (scsi_romid_list.getNumberOfElements() != 1) {
+			scsi_romid_list.clear();
+			scsi_romid_list.add(_T("-"));
+		}
+		cboScsiRomId->setSelected(0);
+		cboScsiRomId->setEnabled(false);
+	}
+}
+
 static void init_expansion2(bool init)
 {
 	static int first = -1;
@@ -534,23 +562,7 @@ static void init_expansion2(bool init)
 	if (scsiromselected > 0)
 		gui_set_string_cursor(scsiromselect_table, cboScsiRomSelect, scsiromselected);
 	cboScsiRomSelectCat->setSelected(scsiromselectedcatnum);
-
-	scsi_romid_list.clear();
-	int index;
-	boardromconfig* brc = get_device_rom(&changed_prefs, static_cast<int>(expansionroms[scsiromselected].romtype), scsiromselectednum, &index);
-	const expansionromtype* ert = &expansionroms[scsiromselected];
-	if (brc && ert && ert->id_jumper) {
-		for (int i = 0; i < 8; i++) {
-			TCHAR tmp[10];
-			_sntprintf(tmp, sizeof tmp, _T("%d"), i);
-			scsi_romid_list.add(tmp);
-		}
-	}
-	else {
-		scsi_romid_list.add(_T("-"));
-		cboScsiRomId->setSelected(0);
-		cboScsiRomId->setEnabled(false);
-	}
+	init_expansion_scsi_id();
 }
 
 static void values_to_expansion2dlg_sub()
@@ -569,15 +581,21 @@ static void values_to_expansion2dlg_sub()
 	}
 	int index;
 	boardromconfig* brc = get_device_rom(&changed_prefs, static_cast<int>(expansionroms[scsiromselected].romtype), scsiromselectednum, &index);
-	if (brc && er->subtypes) {
-		cboScsiRomSubSelect->setSelected(brc->roms[index].subtype);
-		cboScsiRomId->setSelected(brc->roms[index].device_id);
-		deviceflags |= er->subtypes[brc->roms[index].subtype].deviceflags;
+	if (brc) {
+		if (er->subtypes) {
+			cboScsiRomSubSelect->setSelected(brc->roms[index].subtype);
+			deviceflags |= er->subtypes[brc->roms[index].subtype].deviceflags;
+		}
 	}
 	else if (srt) {
 		cboScsiRomSubSelect->setSelected(0);
-		cboScsiRomId->setSelected(0);
 	}
+	else
+	{
+		cboScsiRomId->setEnabled(false);
+	}
+	init_expansion_scsi_id();
+
 	scsirom_selectnum_list.clear();
 	if (deviceflags & EXPANSIONTYPE_CLOCKPORT) {
 		scsirom_selectnum_list.add(_T("-"));
@@ -883,15 +901,12 @@ class ExpansionsActionListener : public gcn::ActionListener
 			std::string full_path = SelectFile("Select ROM", get_rom_path(), filter);
 			if (!full_path.empty())
 			{
-				int val = gui_get_string_cursor(scsiromselect_table, cboScsiRomFile);
-				if (val != -1) {
-					int index;
-					struct boardromconfig* brc = get_device_rom_new(&changed_prefs,
-					                                                static_cast<int>(expansionroms[scsiromselected].romtype),
-					                                                scsiromselectednum, &index);
-					_tcscpy(brc->roms[index].romfile, full_path.c_str());
-					fullpath(brc->roms[index].romfile, MAX_DPATH);
-				}
+				int index;
+				struct boardromconfig* brc = get_device_rom_new(&changed_prefs,
+				                                                static_cast<int>(expansionroms[scsiromselected].romtype),
+				                                                scsiromselectednum, &index);
+				_tcscpy(brc->roms[index].romfile, full_path.c_str());
+				fullpath(brc->roms[index].romfile, MAX_DPATH);
 			}
 			values_to_expansion2dlg();
 		}