# HG changeset patch
# User peter1138 <peter1138@openttd.org>
# Date 2011-11-24 18:55:56
# Node ID be6d7226508e14728a9f8d5b55d35df0026e1860
# Parent  9005678de7eefc4663cae4fe413c9ec8aefdbdc1

(svn r23321) -Fix (r23316): Extra viewports and waypoint detail opened up at wrong zoom level.

diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp
--- a/src/viewport_gui.cpp
+++ b/src/viewport_gui.cpp
@@ -64,8 +64,8 @@ public:
 		this->InitNested(desc, window_number);
 
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(EVW_VIEWPORT);
-		nvp->InitializeViewport(this, 0, ZOOM_LVL_NORMAL);
-		this->DisableWidget(EVW_ZOOMIN);
+		nvp->InitializeViewport(this, 0, ZOOM_LVL_VIEWPORT);
+		if (_settings_client.gui.zoom_min == ZOOM_LVL_VIEWPORT) this->DisableWidget(EVW_ZOOMIN);
 
 		Point pt;
 		if (tile == INVALID_TILE) {
diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp
--- a/src/waypoint_gui.cpp
+++ b/src/waypoint_gui.cpp
@@ -76,7 +76,7 @@ public:
 		this->flags4 |= WF_DISABLE_VP_SCROLL;
 
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WAYPVW_VIEWPORT);
-		nvp->InitializeViewport(this, this->GetCenterTile(), ZOOM_LVL_MIN);
+		nvp->InitializeViewport(this, this->GetCenterTile(), ZOOM_LVL_VIEWPORT);
 
 		this->OnInvalidateData(0);
 	}