From b9f3254b87c9a20dd75238694a8e93ba8020792a Mon Sep 17 00:00:00 2001 From: tarakbumba Date: Tue, 7 Apr 2015 00:16:35 +0300 Subject: Fix g_bus_unwatch_name assertion Guard the g_bus_unwatch_name() call to only run when we actually have set a watcher to the screensaver. --- src/caja-application.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/caja-application.c b/src/caja-application.c index 1eb2a7cb..e4d2d973 100644 --- a/src/caja-application.c +++ b/src/caja-application.c @@ -363,9 +363,13 @@ caja_application_finalize (GObject *object) g_object_unref (application->unique_app); - g_bus_unwatch_name (application->ss_watch_id); + if (application->ss_watch_id > 0) + { + g_bus_unwatch_name (application->ss_watch_id); + } - if (application->volume_queue != NULL) { + if (application->volume_queue != NULL) + { g_list_free_full (application->volume_queue, g_object_unref); application->volume_queue = NULL; } -- cgit v1.2.1