From d653e900f0d79723b46fd41e367cea33a4043a45 Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.2022@distributedrebirth.love>
Date: Thu, 27 Jun 2024 00:02:36 +0200
Subject: [PATCH] Moved settings save on exit false to settings override.

---
 lib/make/mb_openmsx.mk       |  3 ---
 lib/openmsx/boot_env.tcl     | 10 ----------
 lib/openmsx/boot_setting.xml |  1 +
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk
index 58ed983..d4a731e 100644
--- a/lib/make/mb_openmsx.mk
+++ b/lib/make/mb_openmsx.mk
@@ -14,7 +14,6 @@ MB_OPENMSX_SCALE_FACTOR ?= 3
 MB_OPENMSX_THROTTLE     ?= off
 MB_OPENMSX_RENDERER     ?=
 MB_OPENMSX_CTLCACHE     ?= $(MB_CACHE)/omsxctl
-MB_OPENMSX_SAVE_ON_EXIT ?= off
 
 # TODO: create openMSX issue to clean share: https://github.com/openMSX/openMSX/issues/1672
 define _mb_openmsx_setup
@@ -35,8 +34,6 @@ define _mb_openmsx_run
 	JOYPORTB=$(MB_OPENMSX_JOYPORTB) \
 	SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \
 	SPEED=$(MB_OPENMSX_SPEED) \
-	SAVE_SETTINGS_ON_EXIT=$(MB_OPENMSX_SAVE_ON_EXIT) \
-	SOUND_DRIVER=$(MB_OPENMSX_SOUND_DRIVER) \
 	RENDERER=$(MB_OPENMSX_RENDERER) \
 	THROTTLE=$(MB_OPENMSX_THROTTLE) \
 	$(PATH_OPENMSX)/openmsx \
diff --git a/lib/openmsx/boot_env.tcl b/lib/openmsx/boot_env.tcl
index 70edb9b..7970c7b 100644
--- a/lib/openmsx/boot_env.tcl
+++ b/lib/openmsx/boot_env.tcl
@@ -3,9 +3,6 @@
 # Typically used in automation tools which run openMSX without human interaction.
 # Supported environment variables by this script;
 #
-# SAVE_SETTINGS_ON_EXIT=off
-# Disables automatic settings saving.
-#
 # RENDERER=SDL
 # Override video output from command line.
 #
@@ -25,13 +22,6 @@
 # Inserts mouse in joyportb.
 #
 
-if {[info exists ::env(SAVE_SETTINGS_ON_EXIT)] && ([string trim $::env(SAVE_SETTINGS_ON_EXIT)] != "")} {
-	if {[catch {set save_settings_on_exit [string trim $::env(SAVE_SETTINGS_ON_EXIT)]} err_msg]} {
-		puts stderr "error: env.SAVE_SETTINGS_ON_EXIT value $err_msg"
-		exit 1
-	}
-}
-
 if {[info exists ::env(RENDERER)] && ([string trim $::env(RENDERER)] != "")} {
 	if {[catch {set renderer [string trim $::env(RENDERER)]} err_msg]} {
 		puts stderr "error: env.RENDERER value $err_msg"
diff --git a/lib/openmsx/boot_setting.xml b/lib/openmsx/boot_setting.xml
index 82e6b6b..4ddb0ee 100644
--- a/lib/openmsx/boot_setting.xml
+++ b/lib/openmsx/boot_setting.xml
@@ -1,6 +1,7 @@
 <!DOCTYPE settings SYSTEM 'settings.dtd'>
 <settings>
   <settings>
+    <setting id="save_settings_on_exit">false</setting>
     <setting id="sound_driver">null</setting>
   </settings>
   <bindings/>