From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Tue, 8 Apr 2008 09:28:15 +0000 (+0000)
Subject: * src/support/filetools.cpp (unzippedFileName):
X-Git-Tag: 1.6.10~5251
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c0529a3f0a0b8380339fb0b5a6ae38543b5824c7;p=features.git

* src/support/filetools.cpp (unzippedFileName):
	- Fix an assertion with compressed image files
	   that do not have a zip-extension.

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

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index e460efcf2f..464abb81cd 100644
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -665,7 +665,7 @@ string const unzippedFileName(string const & zipped_file)
 	string const ext = getExtension(zipped_file);
 	if (ext == "gz" || ext == "z" || ext == "Z")
 		return changeExtension(zipped_file, string());
-	return "unzipped_" + zipped_file;
+	return onlyPath(zipped_file) + "unzipped_" + onlyFilename(zipped_file);
 }