From: Enrico Forestieri <forenr@lyx.org>
Date: Thu, 26 Apr 2012 13:23:42 +0000 (+0200)
Subject: Fix bug #8139 and a thinko in [737e9b2c/lyxgit].
X-Git-Tag: 2.0.4~125
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7a605c4535edebbc955687bc9aee92fd3aa591e4;p=features.git

Fix bug #8139 and a thinko in [737e9b2c/lyxgit].

No status.20x entry needed, as this should have been part
of [3285ce1d5/lygit].

(cherry picked from commit 66a95b9c1bd26da63459fe430452991b0bc3ec3a)
---

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 9a41d75643..08e8efcd35 100644
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -272,7 +272,9 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path,
 	for (Graph::EdgePath::const_iterator cit = path.begin();
 	     cit != path.end(); ++cit) {
 		Converter const & conv = converterlist_[*cit];
-		if (conv.latex)
+		if (conv.latex) {
+			if (conv.latex_flavor == "latex")
+				return OutputParams::LATEX;
 			if (conv.latex_flavor == "xelatex")
 				return OutputParams::XETEX;
 			if (conv.latex_flavor == "lualatex")
@@ -281,6 +283,7 @@ OutputParams::FLAVOR Converters::getFlavor(Graph::EdgePath const & path,
 				return OutputParams::DVILUATEX;
 			if (conv.latex_flavor == "pdflatex")
 				return OutputParams::PDFLATEX;
+		}
 		if (conv.xml)
 			return OutputParams::XML;
 	}