From 72d8831068ba0a48facba6645920d6ef38ec949d Mon Sep 17 00:00:00 2001
From: sorgelig <pour.garbage@gmail.com>
Date: Wed, 22 Apr 2020 01:40:04 +0800
Subject: [PATCH] AtariST: adjust default config, tweak load/save dialogs.

---
 menu.cpp              | 20 +++++++++++++-------
 support/st/st_tos.cpp |  8 ++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/menu.cpp b/menu.cpp
index 836395d..a9b0819 100644
--- a/menu.cpp
+++ b/menu.cpp
@@ -3092,13 +3092,16 @@ void HandleUI(void)
 
 		m = 0;
 		OsdWrite(m++);
-		OsdWrite(m++);
-		OsdWrite(m++);
+		OsdWrite(m++, " Startup config:");
 		for (uint32_t i = 0; i < 9; i++)
 		{
-			snprintf(s, 29, " %s", tos_get_cfg_string(i));
+			snprintf(s, 29, "  %s", (menumask & (1 << i)) ? tos_get_cfg_string(i) : "");
 			OsdWrite(m++, s, menusub == i, !(menumask & (1<<i)));
-			if(!i) OsdWrite(m++);
+			if (!i)
+			{
+				OsdWrite(m++);
+				OsdWrite(m++, " Other configs:");
+			}
 		}
 
 		for (; m < OsdGetSize() - 1; m++) OsdWrite(m);
@@ -3139,13 +3142,16 @@ void HandleUI(void)
 
 		m = 0;
 		OsdWrite(m++);
-		OsdWrite(m++);
-		OsdWrite(m++);
+		OsdWrite(m++, " Startup config:");
 		for (uint32_t i = 0; i < 9; i++)
 		{
 			snprintf(s, 29, "  %s", tos_get_cfg_string(i));
 			OsdWrite(m++, s, menusub == i, !(menumask & (1 << i)));
-			if (!i) OsdWrite(m++);
+			if (!i)
+			{
+				OsdWrite(m++);
+				OsdWrite(m++, " Other configs:");
+			}
 		}
 
 		for (; m < OsdGetSize() - 1; m++) OsdWrite(m);
diff --git a/support/st/st_tos.cpp b/support/st/st_tos.cpp
index c96c565..1f51f4f 100644
--- a/support/st/st_tos.cpp
+++ b/support/st/st_tos.cpp
@@ -557,16 +557,12 @@ void tos_config_load(int slot)
 	tos_eject_all();
 
 	new_slot = (slot == -1) ? last_slot : slot;
+	memset(&config, 0, sizeof(config));
 
 	// set default values
-	config.system_ctrl = TOS_MEMCONFIG_4M | TOS_CONTROL_BLITTER | TOS_CONTROL_VIDEO_COLOR;
+	config.system_ctrl = TOS_MEMCONFIG_1M | TOS_CONTROL_VIDEO_COLOR | TOS_CONTROL_BORDER;
 	strcpy(config.tos_img, user_io_get_core_path());
 	strcat(config.tos_img, "/TOS.IMG");
-	config.cart_img[0] = 0;
-	strcpy(config.acsi_img[0], "HARDDISK.VHD");
-	config.acsi_img[1][0] = 0;
-	config.video_adjust[0] = config.video_adjust[1] = 0;
-	config.cdc_control_redirect = 0;
 
 	// try to load config
 	name[7] = '0' + new_slot;