add common prefs option '/Interface/Open next message on deletion'

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index a2fae745bb9cb7686f4fd1f6b7172c25d5947155..6e3678c25755e75ed56b5a057ce0c27bb6982a99 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3094,7 +3094,7 @@ void summary_delete(SummaryView *summaryview)
        if (!node)
                node = summary_find_prev_msg(summaryview, sel_last);
 
        if (!node)
                node = summary_find_prev_msg(summaryview, sel_last);
 

-       if (node) {
+       if (node && prefs_common.open_on_delete) {

                if (sel_last && node == gtkut_ctree_node_next(ctree, sel_last))
                        summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
                else if (sel_last && node == GTK_CTREE_NODE_PREV(sel_last))
                if (sel_last && node == gtkut_ctree_node_next(ctree, sel_last))
                        summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
                else if (sel_last && node == GTK_CTREE_NODE_PREV(sel_last))


@@ -3105,7 +3105,10 @@ void summary_delete(SummaryView *summaryview)
                                 messageview_is_visible(summaryview->messageview),
                                 FALSE);
        }
                                 messageview_is_visible(summaryview->messageview),
                                 FALSE);
        }

-
+       else {
+               summary_select_node(summaryview, node, FALSE, FALSE);
+       }
+       

        if (prefs_common.immediate_exec || item->stype == F_TRASH) {
                summary_execute(summaryview);
                /* after deleting, the anchor may be at an invalid row
        if (prefs_common.immediate_exec || item->stype == F_TRASH) {
                summary_execute(summaryview);
                /* after deleting, the anchor may be at an invalid row