summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2023-04-29 11:28:00 +0000
committerMatthias Clasen <mclasen@redhat.com>2023-04-29 11:28:00 +0000
commit90472dc481e83b0890aca66e45ea5c165f432a7f (patch)
treebaf0689b8281eb1aee323c8590a647b68b537421
parentde1660132e6180544622429f0ee97f12096fb6cb (diff)
parenta76ae3eb85d4f92a3ccae1a1f5c1f008c87e7507 (diff)
downloadgtk+-90472dc481e83b0890aca66e45ea5c165f432a7f.tar.gz
Merge branch 'application-signal-cleanup-for-3' into 'gtk-3-24'
Fix a crash See merge request GNOME/gtk!5887
-rw-r--r--gtk/gtkapplication-dbus.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c
index dc0e1bcedb..2c9a1a78ef 100644
--- a/gtk/gtkapplication-dbus.c
+++ b/gtk/gtkapplication-dbus.c
@@ -899,7 +899,8 @@ gtk_application_impl_dbus_finalize (GObject *object)
g_free (dbus->app_menu_path);
g_free (dbus->menubar_path);
g_clear_object (&dbus->sm_proxy);
- g_signal_handlers_disconnect_by_func (dbus->ss_proxy, screensaver_signal_session, dbus->impl.application);
+ if (dbus->ss_proxy)
+ g_signal_handlers_disconnect_by_func (dbus->ss_proxy, screensaver_signal_session, dbus->impl.application);
g_clear_object (&dbus->ss_proxy);
G_OBJECT_CLASS (gtk_application_impl_dbus_parent_class)->finalize (object);