[Scummvm-git-logs] scummvm master -> 8a0fffa67238e25957bc431d43ac9cb51d787c7a

sev- noreply at scummvm.org
Wed Apr 5 08:11:29 UTC 2023


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:
8a0fffa672 BASE: Fixed typo when erasing window-size (#4866)


Commit: 8a0fffa67238e25957bc431d43ac9cb51d787c7a
    https://github.com/scummvm/scummvm/commit/8a0fffa67238e25957bc431d43ac9cb51d787c7a
Author: Wyatt Radkiewicz (35124673+wyatt-radkiewicz at users.noreply.github.com)
Date: 2023-04-05T10:11:23+02:00

Commit Message:
BASE: Fixed typo when erasing window-size (#4866)

When parsing the command line option "window-size" the DO_LONG_OPTION
inserts "window-size" into the settings StringMap. This is soon later
deleted, but instead of deleting "window-size" it deletes the
non-existent setting "window_size". This is needed because width and
height are stored in "last_window_width" and "last_window_height"
respectivly and "window-size" is not used anywhere.

Changed paths:
    base/commandLine.cpp


diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index cb58d51a460..d3a53587a46 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -714,7 +714,7 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha
 
 				settings["last_window_width"] = w;
 				settings["last_window_height"] = h;
-				settings.erase("window_size");
+				settings.erase("window-size");
 			END_OPTION
 #endif
 




More information about the Scummvm-git-logs mailing list