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

macos: plug leak of application windows

Browse Source 
This ensures that we don't leak window references inside the action muxer.
Otherwise, we risk not disposing the windows upon gtk_window_destroy()
and blocking the main loop from quitting.

Fixes #3419
This commit is contained in:
Christian Hergert 2020-12-02 19:42:07 -08:00
parent b68e0bb3fb
commit 004f0a6596
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtkapplication-quartz.c
View File

@ -250,12 +250,38 @@ gtk_application_impl_quartz_shutdown (GtkApplicationImpl *impl)
quartz->inhibitors = NULL; quartz->inhibitors = NULL;
} }
static void
on_window_unmap_cb (GtkApplicationImpl *impl,
GtkWindow *window)
{
GtkApplicationImplQuartz *quartz = (GtkApplicationImplQuartz *) impl;
if ((GActionGroup *)window == gtk_action_muxer_get_group (quartz->muxer, "win"))
gtk_action_muxer_remove (quartz->muxer, "win");
}
static void static void
gtk_application_impl_quartz_active_window_changed (GtkApplicationImpl *impl, gtk_application_impl_quartz_active_window_changed (GtkApplicationImpl *impl,
GtkWindow *window) GtkWindow *window)
{ {
GtkApplicationImplQuartz *quartz = (GtkApplicationImplQuartz *) impl; GtkApplicationImplQuartz *quartz = (GtkApplicationImplQuartz *) impl;
/* Track unmapping of the window so we can clear the "win" field.
* Without this, we might hold on to a reference of the window
* preventing it from getting disposed.
*/
if (window != NULL && !g_object_get_data (G_OBJECT (window), "quartz-muxer-umap"))
{
gulong handler_id = g_signal_connect_object (window,
"unmap",
G_CALLBACK (on_window_unmap_cb),
impl,
G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (window),
"quartz-muxer-unmap",
GSIZE_TO_POINTER (handler_id));
}
gtk_action_muxer_remove (quartz->muxer, "win"); gtk_action_muxer_remove (quartz->muxer, "win");
if (G_IS_ACTION_GROUP (window)) if (G_IS_ACTION_GROUP (window))