2009-07-16 [colin] 3.7.2cvs9

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

diff --git a/ChangeLog b/ChangeLog
index c25554bf0ef5faf6460874e23c6d41814a41a495..5398fed3e4de2c16c554bf9c23f6ea39a1633f33 100644 (file)
--- 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
 2009-07-14 [colin]     3.7.2cvs8
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index f7c23ec40aa6694816fe747d9f2f77c6883ff84f..bcb1b4484bf4755af491f78f3201e4176f3b5def 100644 (file)
--- 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.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
index a5c9b6e4695190d3e172fb06251f55c8c3ee34fe..d8531b2b3e24fd296c2d0ac0363276f85b6f2969 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=8
+EXTRA_VERSION=9

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 4c8eb44e9eef3279a17e11ff03e277230a1e8102..41ea23a7c4becc6d0316e79735a735d69ae92fd1 100644 (file)
--- 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);
        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;
 
        if (new_window && prefs_common.layout_mode != SMALL_LAYOUT) {
                MessageView *msgview;