Fix bug 4772, which was revealed by the removal of the embedding stuff. But the bug...

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 a8c0d924328030a55d11f3ff8fb0a9bd3f2b205a..aaa8bc5c79af69f9d00cc8ecdec70ce08c07f647 100644 (file)
--- 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 fb30988f9b6ace37de1c23f99c4435b6f9a6f7d1..b7c3b49b56c1b521f17d92d21367851f5bfe935a 100644 (file)
--- 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;
 }