Merge tag '1.11.0-RC1' into master

2021-03-15 21:01:22 +02:00
parent 033ba4a99f ad256b5c1d
commit 6ff256a3d1
170 changed files with 4755 additions and 2816 deletions
--- a/src/error_gui.cpp
+++ b/src/error_gui.cpp
@@ -414,6 +414,7 @@ void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel

 	bool no_timeout = wl == WL_CRITICAL;

+	if (_game_mode == GM_BOOTSTRAP) return;
 	if (_settings_client.gui.errmsg_duration == 0 && !no_timeout) return;

 	ErrorMessageData data(summary_msg, detailed_msg, no_timeout ? 0 : _settings_client.gui.errmsg_duration, x, y, textref_stack_grffile, textref_stack_size, textref_stack);