[Scummvm-git-logs] scummvm master -> eadeea23befbafc248cba1d39239f6422d9e7f7e

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
eadeea23be NUVIE: Fix quit config flag gettng permanently saved


Commit: eadeea23befbafc248cba1d39239f6422d9e7f7e
    https://github.com/scummvm/scummvm/commit/eadeea23befbafc248cba1d39239f6422d9e7f7e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-25T15:09:18-07:00

Commit Message:
NUVIE: Fix quit config flag gettng permanently saved

Changed paths:
    engines/ultima/nuvie/conf/configuration.cpp


diff --git a/engines/ultima/nuvie/conf/configuration.cpp b/engines/ultima/nuvie/conf/configuration.cpp
index 2a01927fff..a5917f0be6 100644
--- a/engines/ultima/nuvie/conf/configuration.cpp
+++ b/engines/ultima/nuvie/conf/configuration.cpp
@@ -37,6 +37,7 @@ Configuration::Configuration() : _configChanged(false) {
 	_localKeys["GameName"] = "";
 	_localKeys["GameID"] = "";
 	_localKeys["datadir"] = "data";		// This maps to ultima6/ in ultima.dat
+	_localKeys["quit"] = "false";
 }
 
 Configuration::~Configuration() {
@@ -150,7 +151,10 @@ void Configuration::value(const Std::string &key, bool &ret, bool defaultvalue)
 	Std::string k = key.substr(7);
 
 	// Check for local entry
-	assert(!_localKeys.contains(k));
+	if (_localKeys.contains(k)) {
+		ret = _localKeys[k].hasPrefixIgnoreCase("t");
+		return;
+	}
 
 	// Check for ScummVM key
 	if (ConfMan.hasKey(k)) {
@@ -246,10 +250,13 @@ bool Configuration::set(const Std::string &key, bool value) {
 
 	assert(key.hasPrefix("config/"));
 	Std::string k = key.substr(7);
-	assert(!_localKeys.contains(k));
 
-	ConfMan.setBool(k, value);
-	_configChanged = true;
+	if (_localKeys.contains(k)) {
+		_localKeys[k] = value ? "true" : "false";
+	} else {
+		ConfMan.setBool(k, value);
+		_configChanged = true;
+	}
 
 	return true;
 }