From: Richard Heck <rgheck@comcast.net>
Date: Fri, 19 Jun 2009 17:51:17 +0000 (+0000)
Subject: Not sure how that happened.
X-Git-Tag: 2.0.0~6250
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1ef0168dd4e006a180a6225b50242cc5bd88ace6;p=features.git

Not sure how that happened.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30193 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index d5621f6618..2a8fdf7a59 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -629,7 +629,7 @@ docstring InsetInclude::xhtml(odocstream & os, OutputParams const &rp) const
 
 	// For verbatim and listings, we just include the contents of the file as-is.
 	// In the case of listings, we wrap it in <pre>.
-	bool const listing = isListings(params();
+	bool const listing = isListings(params());
 	if (listing || isVerbatim(params())) {
 		if (listing)
 			os << "<pre>\n";
@@ -643,6 +643,9 @@ docstring InsetInclude::xhtml(odocstream & os, OutputParams const &rp) const
 	// We don't (yet) know how to Input or Include non-LyX files.
 	// (If we wanted to get really arcane, we could run some tex2html
 	// converter on the included file. But that's just masochistic.)
+	string const parent_filename = buffer().absFileName();
+	FileName const included_file = 
+		makeAbsPath(to_utf8(params()["filename"]), onlyPath(parent_filename));
 	if (!isLyXFilename(included_file.absFilename())) {
 		frontend::Alert::warning(_("Unsupported Inclusion"),
 					 _("LyX does not know how to include non-LyX files when"
@@ -655,9 +658,6 @@ docstring InsetInclude::xhtml(odocstream & os, OutputParams const &rp) const
 
 	// Check we're not trying to include ourselves.
 	// FIXME RECURSIVE INCLUDE
-	string const parent_filename = buffer().absFileName();
-	FileName const included_file = 
-		makeAbsPath(to_utf8(params()["filename"]), onlyPath(parent_filename));
 	if (buffer().absFileName() == included_file.absFilename()) {
 		Alert::error(_("Recursive input"),
 			       bformat(_("Attempted to include file %1$s in itself! "