* GuiToolbar.cpp (updateContents):

	- properly disable layout combo (bug 5054)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25677 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 0510f29509181b546c96d4afdf5696d96629c028..6a4f990b846155f10c695522663fb360b8d36529 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -635,7 +635,8 @@ void GuiLayoutBox::updateContents(bool reset)
        // needed to recalculate size hint
        hide();
        setMinimumWidth(sizeHint().width());
-       setEnabled(!buffer->isReadonly());
+       setEnabled(!buffer->isReadonly() &&
+               lyx::getStatus(FuncRequest(LFUN_LAYOUT)).enabled());
        show();
 }