forked from mirror/OpenTTD
(svn r20822) -Fix [FS#3707]: deadlock when aborting map generation on windows
This commit is contained in:
@@ -90,7 +90,6 @@ static void CleanupGeneration()
|
|||||||
|
|
||||||
DeleteWindowById(WC_GENERATE_PROGRESS_WINDOW, 0);
|
DeleteWindowById(WC_GENERATE_PROGRESS_WINDOW, 0);
|
||||||
MarkWholeScreenDirty();
|
MarkWholeScreenDirty();
|
||||||
_genworld_mapgen_mutex->EndCritical();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -179,6 +178,7 @@ static void _GenerateWorld(void *)
|
|||||||
IncreaseGeneratingWorldProgress(GWP_GAME_START);
|
IncreaseGeneratingWorldProgress(GWP_GAME_START);
|
||||||
|
|
||||||
CleanupGeneration();
|
CleanupGeneration();
|
||||||
|
_genworld_mapgen_mutex->EndCritical();
|
||||||
|
|
||||||
ShowNewGRFError();
|
ShowNewGRFError();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user