[Scummvm-cvs-logs] SF.net SVN: scummvm:[38448] scummvm/trunk/gui

[vinterstum at users.sourceforge.net]

Revision: 38448
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38448&view=rev
Author:   vinterstum
Date:     2009-02-17 21:02:47 +0000 (Tue, 17 Feb 2009)

Log Message:
-----------
When adding games from a directory the user had no permissions to, instead of exiting with an error we'll (for normal adds) show an error message and (for mass adds) just continue in the list.

Modified Paths:
--------------
    scummvm/trunk/gui/launcher.cpp
    scummvm/trunk/gui/massadd.cpp

Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp	2009-02-17 20:50:30 UTC (rev 38447)
+++ scummvm/trunk/gui/launcher.cpp	2009-02-17 21:02:47 UTC (rev 38448)
@@ -658,8 +658,9 @@
 		Common::FSNode dir(_browser->getResult());
 		Common::FSList files;
 		if (!dir.getChildren(files, Common::FSNode::kListAll)) {
-			error("browser returned a node that is not a directory: '%s'",
-					dir.getPath().c_str());
+			MessageDialog alert("ScummVM couldn't open the specified directory!");
+			alert.runModal();
+			return;
 		}
 
 		// ...so let's determine a list of candidates, games that

Modified: scummvm/trunk/gui/massadd.cpp
===================================================================
--- scummvm/trunk/gui/massadd.cpp	2009-02-17 20:50:30 UTC (rev 38447)
+++ scummvm/trunk/gui/massadd.cpp	2009-02-17 21:02:47 UTC (rev 38448)
@@ -155,8 +155,7 @@
 
 		Common::FSList files;
 		if (!dir.getChildren(files, Common::FSNode::kListAll)) {
-			error("browser returned a node that is not a directory: '%s'",
-					dir.getPath().c_str());
+			continue;
 		}
 
 		// Run the detector on the dir


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.