Fix the frickin bug

AaronVanGeffen · AaronVanGeffen · commit 318c8bfebee9 · 2025-08-08T15:17:41.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Fix: [#3167] Dropdown for terrain type selection is displayed at the wrong position.
 - Fix: [#3171] Background of station labels have a visible gap due to being off by one pixel.
 - Fix: [#3184] The minimum size of the map window is miscalculated when it is dragged past a certain point.
+- Fix: [#3190] The map window's minimap isn't centred correctly when it is first opened.
 
 25.07 (2025-07-15)
 ------------------------------------------------------------------------
diff --git a/src/OpenLoco/src/Ui/Windows/MapWindow.cpp b/src/OpenLoco/src/Ui/Windows/MapWindow.cpp
@@ -103,7 +103,7 @@ namespace OpenLoco::Ui::Windows::MapWindow
         statusBar,
     };
 
-    static constexpr auto widgets = makeWidgets(
+    static constexpr auto kWidgets = makeWidgets(
         Widgets::Frame({ 0, 0 }, { 350, 272 }, WindowColour::primary),
         Widgets::Caption({ 1, 1 }, { 348, 13 }, Widgets::Caption::Style::whiteText, WindowColour::primary, StringIds::title_map),
         Widgets::ImageButton({ 335, 2 }, { 13, 13 }, WindowColour::primary, ImageIds::close_button, StringIds::tooltip_close_window),
@@ -2415,7 +2415,7 @@ namespace OpenLoco::Ui::Windows::MapWindow
         }
 
         window = WindowManager::createWindow(WindowType::map, size, WindowFlags::none, getEvents());
-        window->setWidgets(widgets);
+        window->setWidgets(kWidgets);
         window->initScrollWidgets();
         window->frameNo = 0;
 
@@ -2473,7 +2473,7 @@ namespace OpenLoco::Ui::Windows::MapWindow
         const int16_t vpCentreX = ((viewport->viewWidth / 2) + viewport->viewX) / 32;
         const int16_t vpCentreY = ((viewport->viewHeight / 2) + viewport->viewY) / 16;
 
-        auto& widget = widgets[widx::scrollview];
+        auto& widget = window->widgets[widx::scrollview];
         const int16_t miniMapWidth = widget.width() - ScrollView::barWidth;
         const int16_t miniMapHeight = widget.height() - ScrollView::barWidth;
 
