[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-storage.c, 1.115.2.23, 1.115.2.24

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/maildir
In directory talvi:/tmp/cvs-serv12128/maildir

Modified Files:
      Tag: branch_1_0
	maildir-storage.c 
Log Message:
If KEEP_LOCK is set and we timeout, don't crash.



Index: maildir-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.c,v
retrieving revision 1.115.2.23
retrieving revision 1.115.2.24
diff -u -d -r1.115.2.23 -r1.115.2.24
--- maildir-storage.c	22 Feb 2007 12:50:09 -0000	1.115.2.23
+++ maildir-storage.c	22 Feb 2007 13:08:30 -0000	1.115.2.24
@@ -1064,10 +1064,10 @@
 		ret = -1;
 	}*/
 
-	if (mbox->ibox.keep_locked)
+	if (mbox->keep_lock_to != NULL) {
 		maildir_uidlist_unlock(mbox->uidlist);
-	if (mbox->keep_lock_to != NULL)
 		timeout_remove(&mbox->keep_lock_to);
+	}
 
 	maildir_keywords_deinit(mbox->keywords);
 	maildir_uidlist_deinit(mbox->uidlist);