diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2018-09-05 21:46:28 +0200 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2018-09-05 21:46:28 +0200 |
| commit | 3c7d5e749ccafa75718ef00f1d5f6cdc0defacb3 (patch) | |
| tree | 2b003b1fd7a3244f5decee3e80a84eb5e9c1d6ff | |
| parent | ef57e59af6fc7de2d3ab0a58c4cfae830fd8294e (diff) | |
| download | gtk+-3c7d5e749ccafa75718ef00f1d5f6cdc0defacb3.tar.gz | |
GtkApplication: Fix CRITICAL on shutdown when register_session=FALSE
| -rw-r--r-- | gtk/gtkapplication-dbus.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c index 25015eb68c..0946edf35c 100644 --- a/gtk/gtkapplication-dbus.c +++ b/gtk/gtkapplication-dbus.c @@ -826,15 +826,22 @@ gtk_application_impl_dbus_finalize (GObject *object) { GtkApplicationImplDBus *dbus = (GtkApplicationImplDBus *) object; - g_dbus_connection_call (dbus->session, - "org.freedesktop.portal.Desktop", - dbus->session_id, - "org.freedesktop.portal.Session", - "Close", - NULL, NULL, 0, -1, NULL, NULL, NULL); - - g_free (dbus->session_id); - g_dbus_connection_signal_unsubscribe (dbus->session, dbus->state_changed_handler); + if (dbus->session_id) + { + g_dbus_connection_call (dbus->session, + "org.freedesktop.portal.Desktop", + dbus->session_id, + "org.freedesktop.portal.Session", + "Close", + NULL, NULL, 0, -1, NULL, NULL, NULL); + + g_free (dbus->session_id); + } + + if (dbus->state_changed_handler) + g_dbus_connection_signal_unsubscribe (dbus->session, + dbus->state_changed_handler); + g_clear_object (&dbus->inhibit_proxy); g_slist_free_full (dbus->inhibit_handles, inhibit_handle_free); g_free (dbus->app_menu_path); |