From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Sun, 30 Sep 2007 12:38:08 +0000 (+0000)
Subject: * src/insets/InsetGraphics.cpp (prepareFile):
X-Git-Tag: 1.6.10~8109
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=cb28ab77bc185190e3e6f7337565344dd42895a3;p=lyx.git

* src/insets/InsetGraphics.cpp (prepareFile):
	- Fix wrong external_path that triggered an assert on Windows
	  while exporting to LaTeX (bug 4243).

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

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 4f58f76ac3..cff5a843ea 100644
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -627,13 +627,12 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
 	if (status == FAILURE)
 		return orig_file;
 
-	// a relative filename should be relative to the master
-	// buffer.
+	// a relative filename should be relative to the master buffer.
 	// "nice" means that the buffer is exported to LaTeX format but not
-	//        run through the LaTeX compiler.
-	string output_file = support::os::external_path(runparams.nice ?
+	// run through the LaTeX compiler.
+	string output_file = runparams.nice ?
 		params().filename.outputFilename(m_buffer->filePath()) :
-		onlyFilename(temp_file.absFilename()));
+		onlyFilename(temp_file.absFilename());
 
 	if (runparams.nice && !isValidLaTeXFilename(output_file)) {
 		frontend::Alert::warning(_("Invalid filename"),