gvfs r1854 - in trunk: . client

[gicmo svn gnome org]

Author: gicmo
Date: Sun Aug  3 08:31:14 2008
New Revision: 1854
URL: http://svn.gnome.org/viewvc/gvfs?rev=1854&view=rev

Log:
Bug 543552: gvfs-fuse-daemon crashes if dbus dies

Avoid a race between the subthread and the main thread in the case
of dbus going bye-bye.
Bug #543552. Patch from Austin Lund <austin lund gmail com>


Modified:
   trunk/ChangeLog
   trunk/client/gvfsfusedaemon.c

Modified: trunk/client/gvfsfusedaemon.c
==============================================================================
--- trunk/client/gvfsfusedaemon.c	(original)
+++ trunk/client/gvfsfusedaemon.c	Sun Aug  3 08:31:14 2008
@@ -2037,6 +2037,7 @@
   g_signal_handlers_disconnect_by_func (volume_monitor, mount_tracker_unmounted_cb, NULL);
 
   g_main_loop_unref (subthread_main_loop);
+  subthread_main_loop = NULL;
 
   g_object_unref (volume_monitor);
   volume_monitor = NULL;
@@ -2148,7 +2149,8 @@
 vfs_destroy (gpointer param)
 {
   mount_list_free ();
-  g_main_loop_quit (subthread_main_loop);
+  if (subthread_main_loop != NULL) 
+    g_main_loop_quit (subthread_main_loop);
   g_mutex_free (mount_list_mutex);
   g_object_unref (gvfs);
 }