Add cyx's patch for #1497725 - GUI: trying to enter empty CD drive

svn-id: r23475

2 files changed, 16 insertions, 5 deletions

diff --git a/common/config-manager.cpp b/common/config-manager.cpp
index 7651f58ee2..1f79c22c07 100644
--- a/common/config-manager.cpp
+++ b/common/config-manager.cpp
@@ -124,8 +124,15 @@ void ConfigManager::loadDefaultConfigFile() {
 				char oldConfigFile[MAXPATHLEN];
 				GetWindowsDirectory(oldConfigFile, MAXPATHLEN);
 				strcat(oldConfigFile, "\\" DEFAULT_CONFIG_FILE);
-				if (fopen(oldConfigFile, "r"))
+				if (fopen(oldConfigFile, "r")) {
+					printf("The default location of the config file (scummvm.ini) in ScummVM has changed,\n");
+					printf("under Windows NT4/2000/XP/Vista. You may want to consider moving your config\n");
+					printf("file from the old default location:\n");
+					printf("%s\n", oldConfigFile);
+					printf("to the new default location:\n");
+					printf("%s\n\n", configFile);
 					strcpy(configFile, oldConfigFile);
+				}
 			}
 		} else {
 			// Check windows directory
diff --git a/gui/browser.cpp b/gui/browser.cpp
index 59ab8ee5ae..40d5121458 100644
--- a/gui/browser.cpp
+++ b/gui/browser.cpp
@@ -221,14 +221,18 @@ void BrowserDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
 void BrowserDialog::updateListing() {
 	// Update the path display
 	_currentPath->setLabel(_node.path());
-	
+
 	// We memorize the last visited path.
 	ConfMan.set("browser_lastpath", _node.path());
 
 	// Read in the data from the file system
-	_node.listDir(_nodeContent, _isDirBrowser ? FilesystemNode::kListDirectoriesOnly
-	                                          : FilesystemNode::kListAll);
-	Common::sort(_nodeContent.begin(), _nodeContent.end());
+	FilesystemNode::ListMode listMode = _isDirBrowser ? FilesystemNode::kListDirectoriesOnly
+	                                                  : FilesystemNode::kListAll;
+	if (!_node.listDir(_nodeContent, listMode)) {
+		_nodeContent.clear();
+	} else {
+		Common::sort(_nodeContent.begin(), _nodeContent.end());
+	}
 
 	// Populate the ListWidget
 	Common::StringList list;