Fixes after merge

BlitterStudio · Jan 6, 2025 · 1ce4f76 · 1ce4f76
1 parent 1785c5e
commit 1ce4f76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp
@@ -4907,6 +4907,7 @@ std::vector<std::string> get_cd_drives()
 	pclose(fp);
 	return results;
 }
+
 void target_setdefaultstatefilename(const TCHAR* name)
 {
 	TCHAR path[MAX_DPATH];

diff --git a/src/osdep/gui/PanelHD.cpp b/src/osdep/gui/PanelHD.cpp
@@ -375,7 +375,8 @@ class CDFileActionListener : public gcn::ActionListener
 						bIgnoreListChange = true;
 						cboCDFile->setSelected(0);
 						bIgnoreListChange = false;
-						SetLastActiveConfig(element.c_str());
+						if (!last_loaded_config[0])
+							set_last_active_config(element.c_str());
 					}
 				}
 			}

diff --git a/src/osdep/gui/PanelQuickstart.cpp b/src/osdep/gui/PanelQuickstart.cpp
@@ -423,7 +423,8 @@ class QSCDActionListener : public gcn::ActionListener
 						bIgnoreListChange = true;
 						cboCDFile->setSelected(0);
 						bIgnoreListChange = false;
-						SetLastActiveConfig(element.c_str());
+						if (!last_loaded_config[0])
+							set_last_active_config(element.c_str());
 					}
 				}
 			}