Provide more info if a subgame is not valid/found

minetest · Dec 13, 2014 · 784a452 · 784a452
1 parent ce4ed65
commit 784a452
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -1395,6 +1395,12 @@ static bool determine_subgame(GameParams *game_params)
 		} else { // Otherwise we will be using "minetest"
 			gamespec = findSubgame(g_settings->get("default_game"));
 			infostream << "Using default gameid [" << gamespec.id << "]" << std::endl;
+			if (!gamespec.isValid()) {
+				errorstream << "Subgame specified in default_game ["
+				            << g_settings->get("default_game")
+				            << "] is invalid." << std::endl;
+				return false;
+			}
 		}
 	} else { // World exists
 		std::string world_gameid = getWorldGameId(game_params->world_path, false);