From: Juergen Spitzmueller <spitz@lyx.org>
Date: Fri, 21 Aug 2020 09:07:22 +0000 (+0200)
Subject: Do not attempt to close language twice
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~335
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=448e5efab42;p=features.git

Do not attempt to close language twice
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 8ef7c20e75..d1c7fe9dfa 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2615,6 +2615,7 @@ void Paragraph::latex(BufferParams const & bparams,
 		}
 
 		// Do we need to close the previous font?
+		bool langClosed = false;
 		if (open_font &&
 		    ((current_font != running_font
 		      || current_font.language() != running_font.language())
@@ -2650,6 +2651,7 @@ void Paragraph::latex(BufferParams const & bparams,
 			}
 			running_font = basefont;
 			open_font = false;
+			langClosed = true;
 		}
 
 		// if necessary, close language environment before opening CJK
@@ -2749,7 +2751,7 @@ void Paragraph::latex(BufferParams const & bparams,
 				}
 			} else {
 				running_font = current_font;
-				open_font = true;
+				open_font = !langClosed;
 			}
 		}