* src/summaryview.c

	summary_sort(): check non-NULL summaryview->folder_item when no
	folder is selected at all
	(closes "[ 610344 ] sort label make syl Crash")

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d891b4d2d5f7da4cf130b3d326c81dd03b9bacc3..4d4c9af9b4e126249d0adc2a3cbd2a5b4a217919 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-09-17 [alfons]    0.8.2claws56
+       
+       * src/summaryview.c
+               summary_sort(): check non-NULL summaryview->folder_item when no 
+               folder is selected at all
+               (closes "[ 610344 ] sort label make syl Crash")
+
 2002-09-17 [alfons]    0.8.2claws55
        
        * src/compose.c

diff --git a/configure.in b/configure.in
index 6d77b208a324d6cbf6f252298de7bd74a853b816..1d04d40fa444c95320d7877f10d641fb98dbba3a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws55
+EXTRA_VERSION=claws56
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/summaryview.c b/src/summaryview.c
index 745d74d31a9f392ba787efc31487aa07a4528452..17422a03073d76bee7dbaeb5e4eb1dffed8c6a26 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1978,9 +1978,10 @@ void summary_sort(SummaryView *summaryview,
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_date;
                break;
        case SORT_BY_FROM:
-               cmp_func = summaryview->folder_item->stype != F_OUTBOX ? 
-                       (GtkCListCompareFunc) summary_cmp_by_from :
-                       (GtkCListCompareFunc) summary_cmp_by_to;
+               if (summaryview->folder_item && summaryview->folder_item->stype != F_OUTBOX)
+                       cmp_func = (GtkCListCompareFunc) summary_cmp_by_from;
+               else                    
+                       cmp_func = (GtkCListCompareFunc) summary_cmp_by_to;
                break;
        case SORT_BY_SUBJECT:
                if (summaryview->simplify_subject_preg)