From: Christoph Hohmann <reboot@gmx.ch>
Date: Sat, 27 Jul 2002 23:57:07 +0000 (+0000)
Subject: * src/folder.c
X-Git-Tag: rel_0_8_1~8
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d7195713ea375efd786c2e98b4376c60c0403800

* src/folder.c
        add extra check if fetching the msginfo
        returned NULL
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3287b1db6..bb5512ff4 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-07-27 [christoph]	0.8.0claws23
+
+	* src/folder.c
+		add extra check if fetching the msginfo
+		returned NULL
+
 2002-07-27 [paul]	0.8.0claws22
 
 	* sync with 0.8.1cvs2
diff --git a/configure.in b/configure.in
index 512563131..703b1bd83 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws22
+EXTRA_VERSION=claws23
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/folder.c b/src/folder.c
index 291595e2f..96f0f7f03 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -1283,15 +1283,19 @@ gint folder_item_add_msg(FolderItem *dest, const gchar *file,
         if (num > 0) {
     		msginfo = folder->fetch_msginfo(folder, dest, num);
 
-		if(MSG_IS_NEW(msginfo->flags))
-			dest->new++;
-		if(MSG_IS_UNREAD(msginfo->flags))
-			dest->unread++;
-		dest->total++;
+		if(msginfo != NULL) {
+			if(MSG_IS_NEW(msginfo->flags))
+			        dest->new++;
+		        if(MSG_IS_UNREAD(msginfo->flags))
+				dest->unread++;
+			dest->total++;
+
+            		msgcache_add_msg(dest->cache, msginfo);
+
+    			procmsg_msginfo_free(msginfo);
+		}
 
                 dest->last_num = num;
-                msgcache_add_msg(dest->cache, msginfo);
-    		procmsg_msginfo_free(msginfo);
         }
 
 	return num;