From 0586e48c3bf93ddc0e84502910c0f4f564dd1b45 Mon Sep 17 00:00:00 2001
From: dP <dp@dpointer.org>
Date: Sun, 14 Dec 2025 16:16:29 +0500
Subject: [PATCH] Fix road/rail station building buttons malfunction when
 switching from other tool

---
 src/citymania/cm_highlight.cpp | 4 +---
 src/road_gui.cpp               | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/citymania/cm_highlight.cpp b/src/citymania/cm_highlight.cpp
index d1e4a3937c..72840ddf41 100644
--- a/src/citymania/cm_highlight.cpp
+++ b/src/citymania/cm_highlight.cpp
@@ -2893,8 +2893,6 @@ bool HandlePlacePushButton(Window *w, WidgetID widget, up<Tool> tool) {
         return false;
     }
 
-    w->LowerWidget(widget);
-
     auto icon = tool->GetCursor();
     if ((icon & ANIMCURSOR_FLAG) != 0) {
         SetAnimatedMouseCursor(_animcursors[icon & ~ANIMCURSOR_FLAG]);
@@ -2904,9 +2902,9 @@ bool HandlePlacePushButton(Window *w, WidgetID widget, up<Tool> tool) {
     citymania::SetActiveTool(std::move(tool));
     _thd.window_class = w->window_class;
     _thd.window_number = w->window_number;
+    w->LowerWidget(widget);
 
     return true;
-
 }
 
 }  // namespace citymania
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 019f155c7e..710a84c1ee 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -569,8 +569,7 @@ struct BuildRoadToolbarWindow : Window {
 			default: NOT_REACHED();
 		}
 		citymania::RoadToolbar_UpdateOptionWidgetStatus(this, widget, _remove_button_clicked, RoadTypeIsRoad(this->roadtype));
-		// this->UpdateOptionWidgetStatus((RoadToolbarWidgets)widget);
-		// if (citymania::_remove_mod) RoadToolbar_CtrlChanged(this);
+		//this->UpdateOptionWidgetStatus((RoadToolbarWidgets)widget);
 	}
 
 	EventState OnHotkey(int hotkey) override