(svn r27085) -Fix: Always return a valid window to the world generation gui code.

This commit is contained in:
alberth
2014-12-18 18:20:59 +00:00
parent edea2ce96d
commit 78896895cf
2 changed files with 7 additions and 4 deletions

View File

@@ -837,7 +837,8 @@ static void _ShowGenerateLandscape(GenenerateLandscapeWindowMode mode)
if (!GetHeightmapDimensions(_file_to_saveload.name, &x, &y)) return;
}
GenerateLandscapeWindow *w = AllocateWindowDescFront<GenerateLandscapeWindow>((mode == GLWM_HEIGHTMAP) ? &_heightmap_load_desc : &_generate_landscape_desc, mode);
WindowDesc *desc = (mode == GLWM_HEIGHTMAP) ? &_heightmap_load_desc : &_generate_landscape_desc;
GenerateLandscapeWindow *w = AllocateWindowDescFront<GenerateLandscapeWindow>(desc, mode, true);
if (mode == GLWM_HEIGHTMAP) {
w->x = x;