Skip to content

Commit 773efc1

Browse files
SmallJokernerzhul
authored andcommittedApr 1, 2017
mapgen: Fix segfault when selecting invalid mapgen (#5491)
1 parent a487427 commit 773efc1

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed
 

Diff for: ‎src/mapgen.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -1003,8 +1003,11 @@ void MapgenParams::readParams(const Settings *settings)
10031003
}
10041004

10051005
std::string mg_name;
1006-
if (settings->getNoEx("mg_name", mg_name))
1007-
this->mgtype = Mapgen::getMapgenType(mg_name);
1006+
if (settings->getNoEx("mg_name", mg_name)) {
1007+
mgtype = Mapgen::getMapgenType(mg_name);
1008+
if (mgtype == MAPGEN_INVALID)
1009+
mgtype = MAPGEN_DEFAULT;
1010+
}
10081011

10091012
settings->getS16NoEx("water_level", water_level);
10101013
settings->getS16NoEx("mapgen_limit", mapgen_limit);

0 commit comments

Comments
 (0)
Please sign in to comment.