talons

commit 4fc12300724cf898331d1312ffcc679b6d8ee6f7
parent 962b8d22dd6fe56ea6b779b4e2d22f89b623752a
Author: Colin Leroy <colin@colino.net>
Date:   Thu, 16 Jul 2009 16:06:54 +0000

2009-07-16 [colin]	3.7.2cvs9

	* src/summaryview.c
		Fix wrong return without unlocking; thanks
		to mupuf_

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/summaryview.c
 | 
9
+++++++--

4 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-16 [colin]	3.7.2cvs9
+
+	* src/summaryview.c
+		Fix wrong return without unlocking; thanks
+		to mupuf_
+
 2009-07-14 [colin]	3.7.2cvs8
 
 	* src/imap.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3833,3 +3833,4 @@
 ( cvs diff -u -r 1.16.2.36 -r 1.16.2.37 src/prefs_display_header.c;  ) > 3.7.2cvs6.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpcore/plugin.def;  cvs diff -u -r 1.20.2.71 -r 1.20.2.72 src/common/utils.h;  ) > 3.7.2cvs7.patchset
 ( cvs diff -u -r 1.179.2.247 -r 1.179.2.248 src/imap.c;  ) > 3.7.2cvs8.patchset
+( cvs diff -u -r 1.395.2.413 -r 1.395.2.414 src/summaryview.c;  ) > 3.7.2cvs9.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -3409,8 +3409,13 @@ static void summary_display_msg_full(SummaryView *summaryview,
 	GTK_EVENTS_FLUSH();
 
 	msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-	
-	cm_return_if_fail(msginfo);
+
+	if (!msginfo) {
+		debug_print("NULL msginfo\n");
+		summary_unlock(summaryview);
+		END_TIMING();
+		return;
+	}	
 
 	if (new_window && prefs_common.layout_mode != SMALL_LAYOUT) {
 		MessageView *msgview;