undo melvin's latest change to summaryview because when selecting a folder, the summa...

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 43d8b587ef6dce2a9ade8df9744a1464bed6df69..2d556d77f5bce3aa2bc6ad773bc8f744edd21bf3 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3753,8 +3753,6 @@ void summary_filter(SummaryView *summaryview)
 
                g_hash_table_destroy(summaryview->folder_table);
                summaryview->folder_table = NULL;
-
-               summary_show(summaryview, summaryview->folder_item, FALSE);
        }
 
        debug_print(_("done.\n"));
@@ -3762,6 +3760,11 @@ void summary_filter(SummaryView *summaryview)
        main_window_cursor_normal(summaryview->mainwin);
 
        summary_unlock(summaryview);
+
+       /* CLAWS: summary_show() only valid after having a lock. ideally
+        * we want the lock to be context aware...  */
+       if (global_processing)
+               summary_show(summaryview, summaryview->folder_item, FALSE);
 }
 
 static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
@@ -3782,7 +3785,7 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
                    summaryview->folder_item != dest)
                        summary_move_row_to(summaryview, node, dest);
        }
-       else
+       else 
                filter_msginfo_move_or_delete(global_processing, msginfo,
                                              summaryview->folder_table);
 }