Change: Allow tram toolbar to open when tram tracks are available, ev…

…en if no vehicles available yet.
OpenTTD · Feb 7, 2019 · 06ea99c · 06ea99c
1 parent dd3f636
commit 06ea99c
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
@@ -312,8 +312,6 @@ struct BuildRoadToolbarWindow : Window {
 			DeleteWindowById(WC_BUILD_DEPOT, TRANSPORT_ROAD);
 			DeleteWindowById(WC_BUS_STATION, TRANSPORT_ROAD);
 			DeleteWindowById(WC_TRUCK_STATION, TRANSPORT_ROAD);
-
-			if (this->roadtype_identifier.IsTram()) delete this;
 		}
 	}
 
@@ -716,7 +714,7 @@ struct BuildRoadToolbarWindow : Window {
  */
 static EventState RoadTramToolbarGlobalHotkeys(int hotkey, RoadTypeIdentifier last_build)
 {
-	if (last_build.basetype == ROADTYPE_TRAM && (_game_mode != GM_NORMAL || !CanBuildRoadTypeInfrastructure(last_build, _local_company))) return ES_NOT_HANDLED;
+	if (last_build.basetype == ROADTYPE_TRAM && (_game_mode != GM_NORMAL || !HasRoadTypeAvail(_local_company, last_build))) return ES_NOT_HANDLED;
 
 	Window *w = NULL;
 	switch (_game_mode) {