diff options
| author | Ross Lagerwall <rosslagerwall@gmail.com> | 2014-09-28 21:52:36 +0100 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2014-10-13 13:04:57 +0200 |
| commit | 86a5d5749e4d45b785c46223b7e9ae0343057178 (patch) | |
| tree | dc9ca95e3f5ecc54f26e60b5af2591b1bd7fdbd8 | |
| parent | 249b39be0a8aab252d7feb904e5c8e3efb6a567f (diff) | |
| download | gvfs-86a5d5749e4d45b785c46223b7e9ae0343057178.tar.gz | |
daemon: Don't abort if jobs != NULL when finalizing
Don't abort if there are outstanding jobs when finalizing. This may
happen if the backend is force unmounted. Use a warning instead.
https://bugzilla.gnome.org/show_bug.cgi?id=710986
| -rw-r--r-- | daemon/gvfsdaemon.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c index 4e624b81..0187223d 100644 --- a/daemon/gvfsdaemon.c +++ b/daemon/gvfsdaemon.c @@ -147,7 +147,9 @@ g_vfs_daemon_finalize (GObject *object) daemon = G_VFS_DAEMON (object); - g_assert (daemon->jobs == NULL); + /* There may be some jobs outstanding if we've been force unmounted. */ + if (daemon->jobs) + g_warning ("daemon->jobs != NULL when finalizing daemon!"); if (daemon->name_watcher) g_bus_unwatch_name (daemon->name_watcher); |