From 5008a09fe920d0e56c74f8b7e0db28fa303930a6 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 23 Sep 2019 20:29:32 +0100 Subject: [PATCH] Avoid unnecessary calls to SettingsDisableElrail in AfterLoadGame --- src/saveload/afterload.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 07c4d2c9b3..3293781b90 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -1680,8 +1680,11 @@ bool AfterLoadGame() /* from version 38 we have optional elrails, since we cannot know the * preference of a user, let elrails enabled; it can be disabled manually */ if (IsSavegameVersionBefore(SLV_38)) _settings_game.vehicle.disable_elrails = false; - /* do the same as when elrails were enabled/disabled manually just now */ - SettingsDisableElrail(_settings_game.vehicle.disable_elrails); + if (IsSavegameVersionBefore(SLV_38) || _settings_game.vehicle.disable_elrails) { + SettingsDisableElrail(_settings_game.vehicle.disable_elrails); + } else { + ReinitGuiAfterToggleElrail(_settings_game.vehicle.disable_elrails); + } InitializeRailGUI(); /* From version 53, the map array was changed for house tiles to allow