LFUN_CLOSE_TAB_GROUP does exactly the same thing as

LFUN_BUFFER_CLOSE_ALL if there's only one tab group open, so there's
no need to enable it in that case.

diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index b7e1f03a93a5b4819763a4614ef522b977096c63..097de8e2d5ce73dffd9b82bb4538837418cc9871 100644 (file)
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -330,7 +330,7 @@ Menuset
                Separator
                Item "Split View Into Left and Right Half|i" "split-view horizontal"
                Item "Split View Into Upper and Lower Half|e" "split-view vertical"
-               Item "Close Current View|w" "close-tab-group"
+               OptItem "Close Current View|w" "close-tab-group"
                Item "Fullscreen|l" "ui-toggle fullscreen"      
                Submenu "Toolbars|b" "toolbars"
                Separator

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index ca636329d6ffff41808f87489c01acff159ef7f8..52a4379fa71befdac8d4c6279a11aa120ef65862 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1702,7 +1702,7 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
                break;
 
        case LFUN_CLOSE_TAB_GROUP:
-               enable = d.currentTabWorkArea();
+               enable = d.tabWorkAreaCount() > 1;
                break;
 
        case LFUN_TOOLBAR_TOGGLE: {