From 0f5886b8569bc1555b212fcecdfb1fb27c08d0f2 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 10 Nov 2015 18:42:24 +0100
Subject: [PATCH] Disable LFUN_LAYOUT when layout cannot be found

Fixes bug #8077
---
 src/Text3.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 8efec47202..9edda1b652 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -3108,13 +3108,12 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		break;
 
 	case LFUN_LAYOUT: {
-		enable = !cur.inset().forcePlainLayout();
-
+		DocumentClass const & tclass = cur.buffer()->params().documentClass();
 		docstring layout = cmd.argument();
-		if (layout.empty()) {
-			DocumentClass const & tclass = cur.buffer()->params().documentClass();
+		if (layout.empty())
 			layout = tclass.defaultLayoutName();
-		}
+		enable = !cur.inset().forcePlainLayout() && tclass.hasLayout(layout);
+
 		flag.setOnOff(layout == cur.paragraph().layout().name());
 		break;
 	}
-- 
2.39.2