[Scummvm-git-logs] scummvm master -> 6e7bfc5b789f624fbfd4fa7b42173e198dc89eab

[antoniou79]

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

Summary:
d6bbc67457 GUI: Fix invalid message when browser path was chosen empty
6e7bfc5b78 GUI: Don't store an invalid browser_lastpath in updateListing()


Commit: d6bbc67457b5a3251170cd39e4b870a5a93045ab
    https://github.com/scummvm/scummvm/commit/d6bbc67457b5a3251170cd39e4b870a5a93045ab
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-02-11T00:54:12+02:00

Commit Message:
GUI: Fix invalid message when browser path was chosen empty

Changed paths:
    gui/launcher.cpp


diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 0e88a5a..4f11d1e 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -357,7 +357,7 @@ void LauncherDialog::addGame() {
 					bannedDirectory += '/';
 				}
 			}
-			if (selectedDirectory.equalsIgnoreCase(bannedDirectory)) {
+			if (selectedDirectory.size() && bannedDirectory.size() && selectedDirectory.equalsIgnoreCase(bannedDirectory)) {
 				MessageDialog alert(_("This directory cannot be used yet, it is being downloaded into!"));
 				alert.runModal();
 				return;


Commit: 6e7bfc5b789f624fbfd4fa7b42173e198dc89eab
    https://github.com/scummvm/scummvm/commit/6e7bfc5b789f624fbfd4fa7b42173e198dc89eab
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-02-11T00:54:56+02:00

Commit Message:
GUI: Don't store an invalid browser_lastpath in updateListing()

Changed paths:
    gui/browser.cpp


diff --git a/gui/browser.cpp b/gui/browser.cpp
index ac79c5d..5ff18eb 100644
--- a/gui/browser.cpp
+++ b/gui/browser.cpp
@@ -189,7 +189,10 @@ void BrowserDialog::updateListing() {
 	_currentPath->setEditString(_node.getPath());
 
 	// We memorize the last visited path.
-	ConfMan.set("browser_lastpath", _node.getPath());
+	// Don't memorize a path that is not a directory
+	if (_node.isDirectory()) {
+		ConfMan.set("browser_lastpath", _node.getPath());
+	}
 
 	// Read in the data from the file system
 	if (!_node.getChildren(_nodeContent, Common::FSNode::kListAll, _showHidden))