[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-storage.c, 1.147, 1.148

[tss at dovecot.org]

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

Modified Files:
	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.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- maildir-storage.c	22 Feb 2007 12:50:15 -0000	1.147
+++ maildir-storage.c	22 Feb 2007 13:08:35 -0000	1.148
@@ -880,10 +880,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);