Make summary_show() open-when-selected behavior more consistent.

Fall back to "on folder open" setting when deciding whether
or not to also open the selected message.

diff --git a/src/summaryview.c b/src/summaryview.c
index 2bfb01dcba757e1bdaa3b0d6fbc91bbed56b59f5..47e1214225e5793dced9d9ab18b9e5d8b63ee0e6 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1464,7 +1464,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                summary_select_by_msgnum(summaryview, selected_msgnum,
                                                OPEN_SELECTED_ON_SEARCH_RESULTS);
                        else
-                               summary_select_by_msgnum(summaryview, selected_msgnum, FALSE);
+                               summary_select_by_msgnum(summaryview, selected_msgnum,
+                                               OPEN_SELECTED_ON_FOLDER_OPEN);
 
                        summary_lock(summaryview);
                        if (!summaryview->selected) {
@@ -1483,7 +1484,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                        summary_select_node(summaryview, node,
                                                        OPEN_SELECTED_ON_SEARCH_RESULTS);
                                else
-                                       summary_select_node(summaryview, node, FALSE);
+                                       summary_select_node(summaryview, node,
+                                                       OPEN_SELECTED_ON_FOLDER_OPEN);
 
                                summary_lock(summaryview);
                        }