patch 9.2.0665: GTK4: GTK critical error on exit printed

Problem:  GTK4: GTK critical error on exit printed
Solution: Only remove controller if it is not NULL
          (Foxe Chen).

closes: #20543

Signed-off-by: Foxe Chen <chen.foxe@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/gui_beval.c b/src/gui_beval.c
index fc653ba4d31ef86b2dd19052b6e79e55acb615ba..c7357fb30c6157a925d7c79ca1199a8dd70291d6 100644 (file)
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -281,7 +281,11 @@ removeEventHandler(BalloonEval *beval)
     GtkEventController *controller;
 
     controller = g_object_get_data(G_OBJECT(target), "beval");
-    gtk_widget_remove_controller(target, controller);
+    if (controller != NULL)
+    {
+       gtk_widget_remove_controller(target, controller);
+       g_object_set_data(G_OBJECT(target), "beval", NULL);
+    }
 #  else
     g_signal_handlers_disconnect_by_func(G_OBJECT(beval->target),
                                         FUNC2GENERIC(target_event_cb),

diff --git a/src/version.c b/src/version.c
index d4bee4d0b99cdb8a3680c56e340e705d55c6a569..81bbaac758f93e69dd613394cf076add3fbc94b2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    665,
 /**/
     664,
 /**/