[Scummvm-git-logs] scummvm branch-2-2 -> 3330b151eb63b19633d3ca3eb2799cf98672fe96

[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:
3330b151eb NUVIE: Change defaultkeys missing to warning


Commit: 3330b151eb63b19633d3ca3eb2799cf98672fe96
    https://github.com/scummvm/scummvm/commit/3330b151eb63b19633d3ca3eb2799cf98672fe96
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-09-27T20:39:37-07:00

Commit Message:
NUVIE: Change defaultkeys missing to warning

Changed paths:
    engines/ultima/nuvie/keybinding/keys.cpp


diff --git a/engines/ultima/nuvie/keybinding/keys.cpp b/engines/ultima/nuvie/keybinding/keys.cpp
index b7e56e3c88..c34a118178 100644
--- a/engines/ultima/nuvie/keybinding/keys.cpp
+++ b/engines/ultima/nuvie/keybinding/keys.cpp
@@ -270,13 +270,15 @@ KeyBinder::KeyBinder(Configuration *config) {
 	config->value("config/keys", keyfilename, "(default)");
 	bool key_file_exists = fileExists(keyfilename.c_str());
 
-	if (keyfilename != "(default)" && !key_file_exists)
-		::error("Couldn't find the default key setting at %s - trying defaultkeys.txt in the data directory\n", keyfilename.c_str());
-	if (keyfilename == "(default)" || !key_file_exists) {
-		config->value("config/datadir", dir, "./data");
-		keyfilename = dir + "/defaultkeys.txt";
+	if (keyfilename != "(default)" && !key_file_exists) {
+		::warning("Couldn't find the default key setting at %s - trying defaultkeys.txt in the data directory\n", keyfilename.c_str());
+	} else {
+		if (keyfilename == "(default)" || !key_file_exists)
+			keyfilename = "defaultkeys.txt";
+
+		if (fileExists(keyfilename.c_str()))
+			LoadFromFile(keyfilename.c_str());
 	}
-	LoadFromFile(keyfilename.c_str());
 
 	LoadGameSpecificKeys(); // won't load if file isn't found
 	LoadFromPatch(); // won't load if file isn't found