From: Richard Heck <rgheck@comcast.net>
Date: Sun, 20 Apr 2008 17:59:14 +0000 (+0000)
Subject: Fix bug 4772, which was revealed by the removal of the embedding stuff. But the bug... 
X-Git-Tag: 1.6.10~5081
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2d9a818f371da68c9b08fc65bb7fe62a454cb30b;p=features.git

Fix bug 4772, which was revealed by the removal of the embedding stuff. But the bug itself traces to r22188.


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

diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp
index a8c0d92432..aaa8bc5c79 100644
--- a/src/frontends/qt4/GuiGraphics.cpp
+++ b/src/frontends/qt4/GuiGraphics.cpp
@@ -460,6 +460,7 @@ void GuiGraphics::updateContents()
 			break;
 	}
 
+	lyxerr << fromqstr(bufferFilepath());
 	string const name =
 		igp.filename.outputFilename(fromqstr(bufferFilepath()));
 	filename->setText(toqstr(name));
diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index fb30988f9b..b7c3b49b56 100644
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -854,7 +854,9 @@ DocFileName::DocFileName(FileName const & abs_filename, bool save_abs)
 void DocFileName::set(string const & name, string const & buffer_path)
 {
 	FileName::set(name);
-	if (!isAbsolute())
+	bool const nameIsAbsolute = isAbsolute();
+	save_abs_path_ = nameIsAbsolute;
+	if (!nameIsAbsolute)
 		FileName::set(makeAbsPath(name, buffer_path).absFilename());
 	zipped_valid_ = false;
 }