From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 30 Jan 2021 14:16:12 +0000 (+0100)
Subject: Do not overwrite InsetLayout font/color
X-Git-Tag: 2.4.0-alpha3~153
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=897ee2ed8819e6ef15ff8eb911d591bab6aa96be;p=lyx.git

Do not overwrite InsetLayout font/color
---

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 0ff5c50ad4..c45a0176d6 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -217,8 +217,10 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass,
 
 	lex.pushTable(elementTags);
 
-	labelfont_ = inherit_font;
-	bgcolor_ = Color_none;
+	if (labelfont_ == sane_font)
+		labelfont_ = inherit_font;
+	if (bgcolor_ == Color_error)
+		bgcolor_ = Color_none;
 	bool getout = false;
 	// whether we've read the CustomPars or ForcePlain tag
 	// for issuing a warning in case MultiPars comes later