From 96080cd8f9859ec003b48baa6526c682e08fff70 Mon Sep 17 00:00:00 2001
From: Louis Moureaux <m_louis30@yahoo.com>
Date: Wed, 27 Dec 2023 03:30:16 +0100
Subject: [PATCH] Fix map view jumping to the next city when switching

Closes #1844.
---
 client/control.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/control.cpp b/client/control.cpp
index a4ef9e7e2d..32efafe44b 100644
--- a/client/control.cpp
+++ b/client/control.cpp
@@ -2542,7 +2542,8 @@ void do_map_click(struct tile *ptile, enum quickselect_type qtype)
       unit_focus_set_and_select(qunit);
       maybe_goto = gui_options->keyboardless_goto;
     }
-  } else if (nullptr != pcity && pcity->client.full) {
+  } else if (qtype == SELECT_POPUP && nullptr != pcity
+             && pcity->client.full) {
     // Otherwise use popups.
     popup_city_dialog(pcity);
   } else if (!near_pcity && unit_list_size(ptile->units) == 0