gvfs r1271 - in trunk: . daemon

[alexl svn gnome org]

Author: alexl
Date: Thu Feb 14 11:42:53 2008
New Revision: 1271
URL: http://svn.gnome.org/viewvc/gvfs?rev=1271&view=rev

Log:
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)




Modified:
   trunk/ChangeLog
   trunk/daemon/gvfschannel.c

Modified: trunk/daemon/gvfschannel.c
==============================================================================
--- trunk/daemon/gvfschannel.c	(original)
+++ trunk/daemon/gvfschannel.c	Thu Feb 14 11:42:53 2008
@@ -343,7 +343,8 @@
 
   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
 	{