From 9c3554fd150a91745bf8827b8f66c5ef316592ed Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 26 Apr 2013 11:10:35 +0100 Subject: [PATCH] fix crasher when using /Edit/Search folder on start-up with nothing selected. also grey out the menu item when a mail folder is not selected --- src/mainwindow.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mainwindow.c b/src/mainwindow.c index c72e20000..40289af2b 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -3296,7 +3296,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin) gint i; gboolean mimepart_selected = FALSE; -#define N_ENTRIES 82 +#define N_ENTRIES 83 static struct { const gchar *entry; SensitiveCondMask cond; @@ -3318,6 +3318,7 @@ do { \ FILL_TABLE("Menu/Edit/DeleteThread", M_TARGET_EXIST, M_SUMMARY_ISLIST); FILL_TABLE("Menu/Edit/Find", M_SINGLE_TARGET_EXIST); FILL_TABLE("Menu/Edit/QuickSearch", M_IN_MSGLIST); + FILL_TABLE("Menu/Edit/SearchFolder", M_TARGET_EXIST, M_SUMMARY_ISLIST); FILL_TABLE("Menu/View/SetColumns/Folderlist", M_UNLOCKED, M_SUMMARY_ISLIST); FILL_TABLE("Menu/View/Sort", M_EXEC, M_SUMMARY_ISLIST); @@ -4204,6 +4205,8 @@ static void search_cb(GtkAction *action, gpointer data) static void search_folder_cb(GtkAction *action, gpointer data) { MainWindow *mainwin = (MainWindow *)data; + FolderItem *item = mainwin->summaryview->folder_item; + cm_return_if_fail(item != NULL); summary_search(mainwin->summaryview); } -- 2.25.1