Fix the drawing of an inset with a relative file path subdir/fig.eps

[features.git] / src / insets / insetgraphics.C

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 814387c8b908c440341c5121cc0767e2e758fb28..649fc0abbf57abd3e0f31af4140ac36db56ff978 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -294,6 +294,18 @@ int InsetGraphics::width(BufferView *, LyXFont const & font) const
 void InsetGraphics::draw(BufferView * bv, LyXFont const & font,
                         int baseline, float & x, bool) const
 {
+       // MakeAbsPath returns params().filename unchanged if it absolute
+       // already.
+       string const file_with_path =
+               MakeAbsPath(params().filename, bv->buffer()->filePath());
+
+       // A 'paste' operation creates a new inset with the correct filepath,
+       // but then the 'old' inset stored in the 'copy' operation is actually
+       // added to the buffer.
+       // Thus, we should ensure that the filepath is correct.
+       if (file_with_path != cache_->loader.filename())
+               cache_->update(file_with_path);
+
        cache_->view = bv->owner()->view();
        int oasc = cache_->old_ascent;