From fc474b02fa17f8a8922b7043268e9b6a933b2ce8 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Tue, 5 Jan 2021 16:40:37 +0100 Subject: [PATCH] Fix: change all Company planes on paint, not only the first that needs changing Otherwise it can take a few OnPaint() calls before all planes are set correctly when switching companies. --- src/company_gui.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/company_gui.cpp b/src/company_gui.cpp index e0bafda877..f55c801d4f 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -2294,7 +2294,7 @@ struct CompanyWindow : Window if (plane != wi->shown_plane) { wi->SetDisplayedPlane(plane); this->InvalidateData(); - return; + reinit = true; } /* Build HQ button handling. */ @@ -2302,8 +2302,7 @@ struct CompanyWindow : Window wi = this->GetWidget(WID_C_SELECT_VIEW_BUILD_HQ); if (plane != wi->shown_plane) { wi->SetDisplayedPlane(plane); - this->SetDirty(); - return; + reinit = true; } this->SetWidgetDisabledState(WID_C_VIEW_HQ, c->location_of_HQ == INVALID_TILE); @@ -2313,8 +2312,7 @@ struct CompanyWindow : Window wi = this->GetWidget(WID_C_SELECT_RELOCATE); if (plane != wi->shown_plane) { wi->SetDisplayedPlane(plane); - this->SetDirty(); - return; + reinit = true; } /* Owners of company */