Don't apply Quickstart model options if we loaded a config on startup

src/main.cpp

@@ -861,7 +861,10 @@ static int real_main2(int argc, TCHAR** argv)
 	}
 	
 	if (restart_config[0])
+	{
 		parse_cmdline_and_init_file(argc, argv);
+		config_loaded = true;
+	}
 	else
 		copy_prefs(&changed_prefs, &currprefs);
 

src/osdep/amiberry_gui.cpp

@@ -29,6 +29,7 @@
 #endif
 
 int emulating = 0;
+bool config_loaded = false;
 
 struct gui_msg
 {

src/osdep/gui/PanelQuickstart.cpp

@@ -819,7 +819,7 @@ void InitPanelQuickstart(const struct _ConfigCategory& category)
 	SetControlState(quickstart_model);
 
 	// Only change the current prefs if we're not already emulating
-	if (!emulating)
+	if (!emulating && !config_loaded)
 		AdjustPrefs();
 
 	RefreshPanelQuickstart();

src/osdep/target.h

@@ -36,6 +36,7 @@ extern void fix_apmodes(struct uae_prefs *p);
 extern int generic_main (int argc, char *argv[]);
 
 extern int emulating;
+extern bool config_loaded;
 
 extern int z3_base_adr;
 #ifdef USE_DISPMANX