From: Craig Robbins <kde.psych@gmail.com>
Date: Sat, 13 Dec 2014 13:01:16 +0000 (+1000)
Subject: Provide more info if a subgame is not valid/found
X-Git-Tag: 0.4.11~34
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=784a452ed52ca3a8b46997c7f787b04a3a07b7d5;p=oweals%2Fminetest.git

Provide more info if a subgame is not valid/found
---

diff --git a/src/main.cpp b/src/main.cpp
index d9fa8faa2..73964c2b0 100644
--- 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);