- Check if path specified for a game in scummvm.ini really exists and complain

  if it does not
- Give more understandable feedback to user when SCUMM module can't find
  a game
- Put TODO to kyra engine as their current detection scheme does not let
  easily tell if game data really present in specified directory

svn-id: r22163

1 files changed, 7 insertions, 2 deletions

diff --git a/base/main.cpp b/base/main.cpp
index 00e5b8b49f..95457bef32 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -167,10 +167,15 @@ static bool launcherDialog(GameDetector &detector, OSystem &system) {
 static int runGame(const Plugin *plugin, OSystem &system, const Common::String &edebuglevels) {
 	// We add it here, so MD5-based detection will be able to
 	// read mixed case files
-	if (ConfMan.hasKey("path"))
+	if (ConfMan.hasKey("path")) {
+		if (!Common::File::exists(ConfMan.get("path"))) {
+			warning("Game directory does not exist (%s)", ConfMan.get("path").c_str());
+			return 0;
+		}
 		Common::File::addDefaultDirectory(ConfMan.get("path"));
-	else
+	} else {
 		Common::File::addDefaultDirectory(".");
+	}
 
 	// Create the game engine
 	Engine *engine = plugin->createInstance(&system);