From: Christoph Hohmann <reboot@gmx.ch>
Date: Thu, 14 Nov 2002 19:50:22 +0000 (+0000)
Subject: * src/folder.c
X-Git-Tag: rel_0_8_6~40
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=e6403606f9c7722b33ba3964f1a2113045da4ad5

* src/folder.c
        fix wrong position of NULL pointer check found
        by Sergey
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e653c0e2b..ae8f674c1 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-11-14 [christoph]	0.8.5claws151
+
+	* src/folder.c
+		fix wrong position of NULL pointer check found
+		by Sergey
+
 2002-11-14 [christoph]	0.8.5claws150
 
 	* src/folder.c
diff --git a/configure.in b/configure.in
index 43f5c3be5..cc9d59657 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws150
+EXTRA_VERSION=claws151
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/folder.c b/src/folder.c
index 5f81a6f0f..1136b9262 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -2011,10 +2011,10 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
 	Folder *folder;
 	gint ret = 0;
 
+	g_return_val_if_fail(item != NULL, -1);
 	folder = item->folder;
+	g_return_val_if_fail(folder != NULL, -1);
 
-	g_return_val_if_fail(item != NULL, -1);
-	
 	if (!item->cache) folder_item_read_cache(item);
 
 	if (folder->remove_msgs) {