Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / Session.cpp

diff --git a/src/Session.cpp b/src/Session.cpp
index 05f02230ebe40a179ef31a0dbd85e9a5a893f91f..35498bdbb479524627174c49833b0b23603d055b 100644 (file)
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -55,11 +55,11 @@ void LastFilesSection::read(istream & is)
                if (c == '[')
                        break;
                getline(is, tmp);
-               if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !absolutePath(tmp))
+               FileName const file(tmp);
+               if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !file.isAbsolute())
                        continue;
 
                // read lastfiles
-               FileName const file(tmp);
                if (file.exists() && !file.isDirectory()
                    && lastfiles.size() < num_lastfiles)
                        lastfiles.push_back(file);
@@ -109,10 +109,10 @@ void LastOpenedSection::read(istream & is)
                if (c == '[')
                        break;
                getline(is, tmp);
-               if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !absolutePath(tmp))
+               FileName const file(tmp);
+               if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !file.isAbsolute())
                        continue;
 
-               FileName const file(tmp);
                if (file.exists() && !file.isDirectory())
                        lastopened.push_back(file);
                else
@@ -163,9 +163,9 @@ void LastFilePosSection::read(istream & is)
                        itmp >> filepos.pos;
                        itmp.ignore(2);  // ignore ", "
                        getline(itmp, fname);
-                       if (!absolutePath(fname))
-                               continue;
                        FileName const file(fname);
+                       if (!file.isAbsolute())
+                               continue;
                        if (file.exists() && !file.isDirectory()
                            && lastfilepos.size() < num_lastfilepos)
                                lastfilepos[file] = filepos;
@@ -240,9 +240,9 @@ void BookmarksSection::read(istream & is)
                        itmp >> pos;
                        itmp.ignore(2);  // ignore ", "
                        getline(itmp, fname);
-                       if (!absolutePath(fname))
-                               continue;
                        FileName const file(fname);
+                       if (!file.isAbsolute())
+                               continue;
                        // only load valid bookmarks
                        if (file.exists() && !file.isDirectory() && idx <= max_bookmarks)
                                bookmarks[idx] = Bookmark(file, pit, pos, 0, 0);