Refresh before checking for equality. Solves problem noted by Bennett.

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

diff --git a/src/Converter.cpp b/src/Converter.cpp
index 111aa92c28b06c6f32f1000f70af7630d937843a..ab7e51f912e2c7fbe782207a52a8404dce1fe609 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -352,7 +352,7 @@ bool Converters::convert(Buffer const * buffer,
                // if input and output files are equal, we use a
                // temporary file as intermediary (JMarc)
                FileName real_outfile;
-               if (outfile.absFilename() == infile.absFilename()) {
+               if (outfile == infile) {
                        real_outfile = infile;
                        // when importing, a buffer does not necessarily exist
                        if (buffer)

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index e0a6271c231a01aa67e0d2e752488a2192cc5e7b..bf675c9a6eb5f6c7d01c0da26b2b7e3689a012de 100644 (file)
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -814,6 +814,9 @@ bool operator==(FileName const & lhs, FileName const & rhs)
        // FIXME: We need to solve this warning from Qt documentation:
        // * Long and short file names that refer to the same file on Windows are
        //   treated as if they referred to different files.
+       lhs.d->refresh();
+       rhs.d->refresh();
+       
        if (!lhs.d->fi.isSymLink() && !rhs.d->fi.isSymLink())
                return lhs.d->fi == rhs.d->fi;