mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: placing random trees in SE crashes the game (#8892) 

This used to work by accident: originally the code checked if
GenerateWorld was threaded. If not, it would abort the function.
This worked for placing trees, because it was also returning false
when it was not active.

With the recent changes, that check got removed, and this crash
started to happen. So now check if we have a modal window, which
is a very solid indication we are generating the world.
pull/8918/head
Patric Stout 2021-03-25 11:57:28 +01:00 committed by Patric Stout
parent 1f8bd4a8d7
commit 14692bf2e4
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/genworld_gui.cpp
View File

@ -1313,6 +1313,12 @@ static void _SetGeneratingWorldProgress(GenWorldProgress cls, uint progress, uin
static_assert(lengthof(percent_table) == GWP_CLASS_COUNT + 1);
assert(cls < GWP_CLASS_COUNT);
/* Check if we really are generating the world.
* For example, placing trees via the SE also calls this function, but
* shouldn't try to update the progress.
*/
if (!HasModalProgress()) return;
if (IsGeneratingWorldAborted()) {
HandleGeneratingWorldAbortion();
return;