AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

window: Ignore gtk_window_close calls from close-request handlers

Browse Source
This commit is contained in:
Timm Bäder 2018-01-18 15:10:49 +01:00
parent aee4634ee5
commit 8a432b42a2
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkwindow.c
View File

@ -264,6 +264,7 @@ struct _GtkWindowPrivate
guint use_subsurface : 1;
guint hide_on_close : 1;
guint in_emit_close_request : 1;
GdkWindowTypeHint type_hint;
@ -1363,6 +1364,9 @@ gtk_window_close (GtkWindow *window)
if (!_gtk_widget_get_realized (GTK_WIDGET (window)))
return;
if (window->priv->in_emit_close_request)
return;
g_object_ref (window);
if (!gtk_window_emit_close_request (window))
@ -5982,9 +5986,17 @@ gtk_window_close_request (GtkWindow *window)
static gboolean
gtk_window_emit_close_request (GtkWindow *window)
{
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
gboolean handled;
/* Avoid re-entrancy issues when calling gtk_window_close from a
* close-request handler */
if (priv->in_emit_close_request)
return TRUE;
priv->in_emit_close_request = TRUE;
g_signal_emit (window, window_signals[CLOSE_REQUEST], 0, &handled);
priv->in_emit_close_request = FALSE;
return handled;
}