diff options
author | Alexander Larsson <alexl@redhat.com> | 2008-02-14 11:42:53 +0000 |
---|---|---|
committer | Alexander Larsson <alexl@src.gnome.org> | 2008-02-14 11:42:53 +0000 |
commit | 61e719ccc1a50bc2cd4f73cf98e3b9a88705704c (patch) | |
tree | fc62bd8a7551f3022a809d72de01b5c9316167ee /daemon/gvfschannel.c | |
parent | 23d307122cabea8f59e154ff4006aa8601c5f186 (diff) | |
download | gvfs-61e719ccc1a50bc2cd4f73cf98e3b9a88705704c.tar.gz |
Fix case where current_job has died (NULL) but the current_job_seq_nr was
2008-02-14 Alexander Larsson <alexl@redhat.com>
* daemon/gvfschannel.c:
Fix case where current_job has died (NULL) but
the current_job_seq_nr was left and matched
a sent cancel op. (#515959)
svn path=/trunk/; revision=1271
Diffstat (limited to 'daemon/gvfschannel.c')
-rw-r--r-- | daemon/gvfschannel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/daemon/gvfschannel.c b/daemon/gvfschannel.c index 8405d1f4..28ad4b88 100644 --- a/daemon/gvfschannel.c +++ b/daemon/gvfschannel.c @@ -343,7 +343,8 @@ got_request (GVfsChannel *channel, if (command == G_VFS_DAEMON_SOCKET_PROTOCOL_REQUEST_CANCEL) { - if (arg1 == channel->priv->current_job_seq_nr) + if (arg1 == channel->priv->current_job_seq_nr && + channel->priv->current_job != NULL) g_vfs_job_cancel (channel->priv->current_job); else { |