From 5256e0f336a08f8ffe50d688c5412a8f712d0fd0 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 21 May 2026 04:30:38 +0300 Subject: [PATCH 41/41] gtk4/x: Fix trading cities Reported by Erik None See RM #2034 Signed-off-by: Marko Lindqvist --- client/gui-gtk-4.0/diplodlg.c | 4 ++-- client/gui-gtk-5.0/diplodlg.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/gui-gtk-4.0/diplodlg.c b/client/gui-gtk-4.0/diplodlg.c index 28f8724ca1..bb2f6c2238 100644 --- a/client/gui-gtk-4.0/diplodlg.c +++ b/client/gui-gtk-4.0/diplodlg.c @@ -437,7 +437,7 @@ static GMenu *create_clause_menu(GActionGroup *group, for (j = 0; j < i; j++) { struct city_deal *deal = fc_malloc(sizeof(struct city_deal)); - fc_snprintf(act_name, sizeof(act_name), "city%s%d", act_plr_part, i); + fc_snprintf(act_name, sizeof(act_name), "city%s%d", act_plr_part, j); act = g_simple_action_new(act_name, NULL); deal->giver = player_number(pgiver); @@ -450,7 +450,7 @@ static GMenu *create_clause_menu(GActionGroup *group, (gpointer)deal); fc_snprintf(act_name, sizeof(act_name), "win.city%s%d", - act_plr_part, i); + act_plr_part, j); menu_item_append_unref(submenu, g_menu_item_new(city_name_get(city_list_ptrs[j]), act_name)); diff --git a/client/gui-gtk-5.0/diplodlg.c b/client/gui-gtk-5.0/diplodlg.c index 90dbccab74..25bb98b1c7 100644 --- a/client/gui-gtk-5.0/diplodlg.c +++ b/client/gui-gtk-5.0/diplodlg.c @@ -486,7 +486,7 @@ static GMenu *create_clause_menu(GActionGroup *group, for (j = 0; j < i; j++) { struct city_deal *deal = fc_malloc(sizeof(struct city_deal)); - fc_snprintf(act_name, sizeof(act_name), "city%s%d", act_plr_part, i); + fc_snprintf(act_name, sizeof(act_name), "city%s%d", act_plr_part, j); act = g_simple_action_new(act_name, NULL); deal->giver = player_number(pgiver); @@ -499,7 +499,7 @@ static GMenu *create_clause_menu(GActionGroup *group, (gpointer)deal); fc_snprintf(act_name, sizeof(act_name), "win.city%s%d", - act_plr_part, i); + act_plr_part, j); menu_item_append_unref(submenu, g_menu_item_new(city_name_get(city_list_ptrs[j]), act_name)); -- 2.53.0