From: Uwe Stöhr <uwestoehr@web.de>
Date: Mon, 24 Oct 2011 17:32:29 +0000 (+0000)
Subject: InsetBox.cpp: fix bug #7849 (with help from Jürgen)
X-Git-Tag: 2.1.0beta1~2510
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a517afc28e9e090f8e0f9ab933c8ed9fc92b8253;p=features.git

InsetBox.cpp: fix bug #7849 (with help from Jürgen)

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 38c864ccbc..ccd1d12107 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -212,10 +212,13 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd,
 	switch (cmd.action()) {
 
 	case LFUN_INSET_MODIFY:
-		if (cmd.getArg(0) == "changetype")
-			flag.setOnOff(cmd.getArg(1) == params_.type);
-		flag.setEnabled(true);
-		return true;
+		if (cmd.getArg(0) == "changetype") {
+			string const type = cmd.getArg(1);
+			flag.setOnOff(type == params_.type);
+			flag.setEnabled(!params_.inner_box || type != "Framed");
+			return true;
+		}
+		return InsetCollapsable::getStatus(cur, cmd, flag);
 
 	case LFUN_INSET_DIALOG_UPDATE:
 		flag.setEnabled(true);