From: Colin Leroy <colin@colino.net>
Date: Fri, 28 Sep 2007 10:56:57 +0000 (+0000)
Subject: 2007-09-28 [colin]	3.0.1cvs38
X-Git-Tag: rel_3_1_0~174
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=9174a920655b4a3b4a648b90e369dd443bbe6f49

2007-09-28 [colin]	3.0.1cvs38

	* src/folder.c
		Fix bug 1337, 'crash on pressing Send button'
---

diff --git a/ChangeLog b/ChangeLog
index 8b9ef8ebf..d2f3453e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-28 [colin]	3.0.1cvs38
+
+	* src/folder.c
+		Fix bug 1337, 'crash on pressing Send button'
+
 2007-09-28 [paul]	3.0.1cvs37
 
 	* src/prefs_folder_item.c
diff --git a/PATCHSETS b/PATCHSETS
index 34072791d..e0f3e6665 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2901,3 +2901,4 @@
 ( cvs diff -u -r 1.1.2.77 -r 1.1.2.78 src/gtk/quicksearch.c;  ) > 3.0.1cvs35.patchset
 ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/prefs_folder_column.c;  cvs diff -u -r 1.10.2.20 -r 1.10.2.21 src/prefs_summary_column.c;  ) > 3.0.1cvs36.patchset
 ( cvs diff -u -r 1.52.2.51 -r 1.52.2.52 src/prefs_folder_item.c;  ) > 3.0.1cvs37.patchset
+( cvs diff -u -r 1.213.2.163 -r 1.213.2.164 src/folder.c;  ) > 3.0.1cvs38.patchset
diff --git a/configure.ac b/configure.ac
index 189d9c281..3e779c0ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=37
+EXTRA_VERSION=38
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folder.c b/src/folder.c
index c62f49d02..38ed4ed4f 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -3479,7 +3479,7 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
 	if (!item->cache) folder_item_read_cache(item);
 
 	msginfo = msgcache_get_msg(item->cache, num);
-	if (MSG_IS_LOCKED(msginfo->flags)) {
+	if (msginfo && MSG_IS_LOCKED(msginfo->flags)) {
 		procmsg_msginfo_free(msginfo);
 		return -1;
 	}
@@ -3515,7 +3515,7 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
 	}
 	while (ret == 0 && msglist != NULL) {
 		MsgInfo *msginfo = (MsgInfo *)msglist->data;
-		if (MSG_IS_LOCKED(msginfo->flags)) {
+		if (msginfo && MSG_IS_LOCKED(msginfo->flags)) {
 			msglist = msglist->next;
 			continue;
 		}