From c8ca16e43dc9024b31e9d3532dc141d0a81f2714 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Thu, 20 Jul 2023 10:04:18 +0100
Subject: [PATCH] Fix crash using picker tool on rail/road stations when no GRF
 classes defined

See: #575
---
 src/rail_gui.cpp | 3 +++
 src/road_gui.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index fd4371c95d..718cdcb084 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -1123,6 +1123,9 @@ private:
 	 */
 	void EnsureSelectedStationClassIsVisible()
 	{
+		/* No additional station types present */
+		if (this->vscroll == nullptr) return;
+
 		uint pos = 0;
 		for (auto station_class : this->station_classes) {
 			if (station_class == _railstation.station_class) break;
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 9007060a63..773367403a 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -1252,6 +1252,9 @@ private:
 
 	void EnsureSelectedClassIsVisible()
 	{
+		/* No additional road stop types present */
+		if (this->vscrollList == nullptr) return;
+
 		uint pos = 0;
 		for (auto rs_class : this->roadstop_classes) {
 			if (rs_class == _roadstop_gui_settings.roadstop_class) break;