Project

General

Profile

Download (1.81 KB)

Bug #2306 » 0036-gtk4-Fix-diplodlg-double-destruction.patch

S3_3, S3_2 - Marko Lindqvist, 09/29/2026 09:18 PM

View differences:

client/gui-gtk-4.0/diplodlg.c
}
/************************************************************************//**
Destroy diplomacy dialog
Remove diplomacy dialog from use.
****************************************************************************/
static void diplomacy_destroy(struct Diplomacy_dialog *pdialog)
static void diplomacy_remove(struct Diplomacy_dialog *pdialog)
{
if (NULL != pdialog->dialog) {
/* pdialog->dialog may be NULL if the tab has been destroyed
* by an other way. */
gui_dialog_destroy(pdialog->dialog);
pdialog->dialog = NULL;
}
/* Dialog destroy callbacks will take care of freeing everything
* related to the pdialog->dialog.
* Here we just take the dialog out of use. */
dialog_list_remove(dialog_list, pdialog);
if (dialog_list) {
......
****************************************************************************/
void close_diplomacy_dialog(struct Diplomacy_dialog *pdialog)
{
diplomacy_destroy(pdialog);
diplomacy_remove(pdialog);
}
/************************************************************************//**
(2-2/2)