From f9985ae65ffaad270013e2ecb618e4556a4411e3 Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 3 Jun 2014 17:56:15 +0100 Subject: [PATCH] fix bug 3170, 'QuickSearch fights with View/Hide read threads menu option' --- src/mainwindow.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mainwindow.c b/src/mainwindow.c index 7b71254db..62b380a40 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -3316,10 +3316,14 @@ do { \ if (mainwin->summaryview->folder_item && !mainwin->summaryview->folder_item->threaded) cm_toggle_menu_set_active_full(mainwin->ui_manager, "Menu/View/HideReadThreads", FALSE); - if (mainwin->summaryview->folder_item && mainwin->summaryview->folder_item->hide_read_msgs) + if ((mainwin->summaryview->folder_item && mainwin->summaryview->folder_item->hide_read_msgs) || + quicksearch_has_sat_predicate(mainwin->summaryview->quicksearch)) cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideReadThreads", FALSE); - if (mainwin->summaryview->folder_item && mainwin->summaryview->folder_item->hide_read_threads) + if ((mainwin->summaryview->folder_item && mainwin->summaryview->folder_item->hide_read_threads) || + quicksearch_has_sat_predicate(mainwin->summaryview->quicksearch)) cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideReadMessages", FALSE); + if (quicksearch_has_sat_predicate(mainwin->summaryview->quicksearch)) + cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/HideDelMessages", FALSE); cm_menu_set_sensitive_full(mainwin->ui_manager, "Menu/View/Goto/PrevHistory", messageview_nav_has_prev(mainwin->messageview)); -- 2.25.1