diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2019-09-02 13:22:31 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2019-09-02 13:22:31 +0000 |
| commit | 2305afbeaa5dda5aa5a2f50d64090be73a00e2fc (patch) | |
| tree | a8b7a13ca02a32440bbf2bb19d9a0451a5681079 | |
| parent | f998e714a7936288b404cfc92cd00b786c7e64dd (diff) | |
| parent | c5e3150443d4fe4b72b41b630da4ba0b7340ed3c (diff) | |
| download | glib-2305afbeaa5dda5aa5a2f50d64090be73a00e2fc.tar.gz | |
Merge branch 'backport-1009-application-crash-glib-2-60' into 'glib-2-60'
Backport !1009 “gapplication: remove inactivity_timeout source on finalize” to glib-2-60
See merge request GNOME/glib!1012
| -rw-r--r-- | gio/gapplication.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gio/gapplication.c b/gio/gapplication.c index 2d2ab48e3..321b34f54 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -1372,6 +1372,9 @@ g_application_finalize (GObject *object) { GApplication *application = G_APPLICATION (object); + if (application->priv->inactivity_timeout_id) + g_source_remove (application->priv->inactivity_timeout_id); + g_slist_free_full (application->priv->option_groups, (GDestroyNotify) g_option_group_unref); if (application->priv->main_options) g_option_group_unref (application->priv->main_options); |