From ae8944e1044b6bfc00f380aba08cebbe5439d9d6 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Mon, 24 Apr 2017 20:03:52 +0100
Subject: BASE: Improve error handling when detecting games

---
 base/commandLine.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'base/commandLine.cpp')

diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 4f3d5687b4..15f064f9e3 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -810,7 +810,10 @@ static GameList getGameList(Common::String path) {
 	Common::FSList files;
 
 	//Collect all files from directory
-	dir.getChildren(files, Common::FSNode::kListAll);
+	if (!dir.getChildren(files, Common::FSNode::kListAll)) {
+		printf("Path %s does not exist or is not a directory.\n", path.c_str());
+		return GameList();
+	}
 
 	// detect Games
 	GameList candidates(EngineMan.detectGames(files));
@@ -928,7 +931,8 @@ static bool massAddGame(Common::String path) {
 		Common::String dataPath = dir.getPath();
 
 		//Collect all files from directory
-		dir.getChildren(files, Common::FSNode::kListAll);
+		if (!dir.getChildren(files, Common::FSNode::kListAll))
+			continue;
 
 		// Get game list and add games
 		GameList candidates(EngineMan.detectGames(files));
-- 
cgit v1.2.3