From: Paweł Pękala Date: Tue, 8 Nov 2011 19:32:15 +0000 (+0000) Subject: 2011-11-08 [pawel] 3.7.10cvs80 X-Git-Tag: REL_3_8_0~34 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=83c95a78754c0a0847bf4273cdbfcb3497f45191;hp=6691eef7ecb005fb1cdd6e47b4e4dd0e4fda9f7b 2011-11-08 [pawel] 3.7.10cvs80 * src/summaryview.c Fix bug #2422 'Toggle Message View w/ V crashes Claws' Fix race condition - don't try to hide messageview while being in the middle of message displaying routine. --- diff --git a/ChangeLog b/ChangeLog index 12ffa2dde..739650690 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-11-08 [pawel] 3.7.10cvs80 + + * src/summaryview.c + Fix bug #2422 'Toggle Message View w/ V crashes Claws' + Fix race condition - don't try to hide messageview while + being in the middle of message displaying routine. + 2011-11-08 [colin] 3.7.10cvs79 * src/codeconv.c diff --git a/PATCHSETS b/PATCHSETS index 8a314ea04..ddfd51620 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4283,3 +4283,4 @@ ( cvs diff -u -r 1.83.2.178 -r 1.83.2.179 src/mimeview.c; cvs diff -u -r 1.96.2.235 -r 1.96.2.236 src/textview.c; cvs diff -u -r 1.12.2.27 -r 1.12.2.28 src/textview.h; ) > 3.7.10cvs77.patchset ( cvs diff -u -r 1.1.2.66 -r 1.1.2.67 src/imap_gtk.c; ) > 3.7.10cvs78.patchset ( cvs diff -u -r 1.65.2.73 -r 1.65.2.74 src/codeconv.c; ) > 3.7.10cvs79.patchset +( cvs diff -u -r 1.395.2.436 -r 1.395.2.437 src/summaryview.c; ) > 3.7.10cvs80.patchset diff --git a/configure.ac b/configure.ac index 1bdf91652..aff5d0a0b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=10 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=79 +EXTRA_VERSION=80 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/summaryview.c b/src/summaryview.c index b468f41c5..ea900e054 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -3637,6 +3637,8 @@ void summary_toggle_view(SummaryView *summaryview) { if (prefs_common.layout_mode == SMALL_LAYOUT) return; + if (summary_is_locked(summaryview)) + return; if (!messageview_is_visible(summaryview->messageview) && summaryview->selected && summary_is_list(summaryview)) summary_display_msg(summaryview,