From 5961106f9ffd9e9a2bc23e4bd700f6ce07505c9a Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sun, 7 Apr 2013 01:50:20 -0400 Subject: [PATCH] Fix crash on creating map with invalid mg_name --- src/emerge.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/emerge.cpp b/src/emerge.cpp index 2a5e84f6..499aaf29 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -243,6 +243,8 @@ MapgenParams *EmergeManager::createMapgenParams(std::string mgname) { MapgenParams *EmergeManager::getParamsFromSettings(Settings *settings) { std::string mg_name = settings->get("mg_name"); MapgenParams *mgparams = createMapgenParams(mg_name); + if (!mgparams) + return NULL; mgparams->mg_name = mg_name; mgparams->seed = settings->getU64(settings == g_settings ? "fixed_map_seed" : "seed"); -- 2.30.2