diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-02-08 11:16:30 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-02-08 11:16:30 +0000 |
| commit | 6ade0679aa792ff11e98ee11429879c8f6b49a37 (patch) | |
| tree | 46c02b4eb34610ce528fe591c4ea4a119bc7f24d | |
| parent | 5cf38be5cb62f3b2b70853251cf7202d28ba654a (diff) | |
Disable the File->Merge... menu item if we cannot save-as,
because this will assert.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40927 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | ui/gtk/main_menubar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 533b21be25..4fd447dc5b 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -4603,7 +4603,7 @@ set_menus_for_capture_file(capture_file *cf) set_toolbar_for_capture_file(FALSE, FALSE); set_toolbar_for_unsaved_capture_file(FALSE); } else { - set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/FileMenu/Merge", TRUE); + set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/FileMenu/Merge", cf_can_save_as(cf)); set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/FileMenu/Close", TRUE); set_menu_sensitivity(ui_manager_main_menubar, "/Menubar/FileMenu/Save", !cf->user_saved); /* |