From: Colin Leroy <colin@colino.net>
Date: Tue, 27 Jul 2004 19:33:35 +0000 (+0000)
Subject: fix wrong test
X-Git-Tag: rel_0_9_12a~64
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=e1d7ebe7b445e15e05ced423dce6d0b153bab033

fix wrong test
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 178288c01..9976260c4 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-07-27 [colin]	0.9.12cvs36
+
+	* src/msgcache.c
+		Fix wrong test 
+
 2004-07-26 [colin]	0.9.12cvs35
 
 	* src/pop.c
diff --git a/PATCHSETS b/PATCHSETS
index daf2f39ae..8a9b0e6e1 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -22,3 +22,4 @@
 ( cvs diff -u -r 1.106 -r 1.107 src/folder.h; cvs diff -u -r 1.244 -r 1.245 src/folderview.c; cvs diff -u -r 1.440 -r 1.441 src/summaryview.c; ) > 0.9.12cvs33.patchset
 ( cvs diff -u -r 1.430 -r 1.431 src/compose.c; ) > 0.9.12cvs34.patchset
 ( cvs diff -u -r 1.65 -r 1.66 src/pop.c; ) > 0.9.12cvs35.patchset
+( cvs diff -u -r 1.24 -r 1.25 src/msgcache.c; ) > 0.9.12cvs36.patchset
diff --git a/configure.ac b/configure.ac
index 611a58875..fc313802b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/msgcache.c b/src/msgcache.c
index cfc1d095b..f9fb46671 100644
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -116,11 +116,13 @@ void msgcache_update_msg(MsgCache *cache, MsgInfo *msginfo)
 	g_return_if_fail(msginfo != NULL);
 
 	oldmsginfo = g_hash_table_lookup(cache->msgnum_table, &msginfo->msgnum);
-	if(msginfo) {
+	if(oldmsginfo && oldmsginfo->msgid) {
 		g_hash_table_remove(cache->msgid_table, oldmsginfo->msgid);
 		g_hash_table_remove(cache->msgnum_table, &oldmsginfo->msgnum);
+	} 
+	if (oldmsginfo)
 		procmsg_msginfo_free(oldmsginfo);
-	}
+
 	cache->memusage -= procmsg_msginfo_memusage(oldmsginfo);
 
 	newmsginfo = procmsg_msginfo_new_ref(msginfo);