From: Richard Heck <rgheck@lyx.org>
Date: Mon, 4 Mar 2013 23:07:48 +0000 (-0500)
Subject: Fix stupid mistake that led to bug #8574.
X-Git-Tag: 2.0.6~78
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6662d6c71da7d0e73a168b1981b927c57b8183b0;p=features.git

Fix stupid mistake that led to bug #8574.
(cherry picked from commit e9879526642085d0a2fc4da3c52642959e9da988)

Conflicts:
	src/insets/InsetInclude.cpp
---

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 119b11f71c..bd97cbeb8e 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -527,7 +527,27 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
 			mangledFileName();
 	}
 
+	if (!runparams.nice)
+		incfile = mangled;
+	else if (!isValidLaTeXFileName(incfile)) {
+		frontend::Alert::warning(_("Invalid filename"),
+			_("The following filename will cause troubles "
+				"when running the exported file through LaTeX: ") +
+			from_utf8(incfile));
+	} else if (!isValidDVIFileName(incfile)) {
+		frontend::Alert::warning(_("Problematic filename for DVI"),
+			_("The following filename can cause troubles "
+				"when running the exported file through LaTeX "
+				"and opening the resulting DVI: ") +
+			from_utf8(incfile), true);
+	}
+
 	FileName const writefile(makeAbsPath(mangled, masterBuffer->temppath()));
+
+	LYXERR(Debug::LATEX, "incfile:" << incfile);
+	LYXERR(Debug::LATEX, "exportfile:" << exportfile);
+	LYXERR(Debug::LATEX, "writefile:" << writefile);
+
 	string const tex_format = flavor2format(runparams.flavor);
 
 	switch (type(params())) {
@@ -590,25 +610,6 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
 		// in a comment or doing a dryrun
 		return;
 
-	if (!runparams.nice)
-		incfile = mangled;
-	else if (!isValidLaTeXFileName(incfile)) {
-		frontend::Alert::warning(_("Invalid filename"),
-			_("The following filename will cause troubles "
-			  "when running the exported file through LaTeX: ") +
-			from_utf8(incfile));
-	}
-	else if (!isValidDVIFileName(incfile)) {
-		frontend::Alert::warning(_("Problematic filename for DVI"),
-			_("The following filename can cause troubles "
-			  "when running the exported file through LaTeX "
-			  "and opening the resulting DVI: ") +
-			from_utf8(incfile), true);
-	}
-	LYXERR(Debug::LATEX, "incfile:" << incfile);
-	LYXERR(Debug::LATEX, "exportfile:" << exportfile);
-	LYXERR(Debug::LATEX, "writefile:" << writefile);
-
 	if (isInputOrInclude(params()) &&
 		 isLyXFileName(included_file.absFileName())) {
 		// if it's a LyX file and we're inputting or including,