only show layer switches for available layers

2 files changed, 2 insertions, 2 deletions

diff --git a/layer.txt b/layer.txt
index 9f5c75ab5..f8f2662c2 100644
--- a/layer.txt
+++ b/layer.txt
@@ -36,7 +36,7 @@ GUI
 *	menu template for management / construction
 
 +	add selection of number of layers
--	only show layer switches for available layers
++	only show layer switches for available layers
 ?	only show tiles of current layer
 -	fix the coordinates in the "help area"
 -	signatures, station names (on all layers), effects (on the desired layer)
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index b0a00a383..a9d865d81 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -1028,7 +1028,7 @@ static CallBackFunction MenuClickUnderground(int index)
 
 static CallBackFunction ToolbarUndergroundClick(Window *w)
 {
-	PopupMainToolbMenu(w, WID_TN_UNDERGROUND, STR_LANDSCAPING_MENU_UNDERGROUND, 5);
+	PopupMainToolbMenu(w, WID_TN_UNDERGROUND, STR_LANDSCAPING_MENU_UNDERGROUND, 1+LayerCount());
 	if (_settings_client.sound.click_beep) SndPlayFx(SND_15_BEEP);
 	return CBF_NONE;
 }