prepare Qt 5.6 builds

[lyx.git] / src / Session.cpp

diff --git a/src/Session.cpp b/src/Session.cpp
index 7f39bd6be354456b9ef49ef4788302181becce84..3fc7ca2c39bd124ee97cc614c66edb1b092a8eaf 100644 (file)
--- a/src/Session.cpp
+++ b/src/Session.cpp
@@ -40,7 +40,6 @@ string const sec_lastcommands = "[last commands]";
 
 namespace lyx {
 
-
 LastFilesSection::LastFilesSection(unsigned int num) :
        default_num_last_files(4),
        absolute_max_last_files(100)
@@ -85,7 +84,7 @@ void LastFilesSection::add(FileName const & file)
        LastFiles::iterator it = find(lastfiles.begin(), lastfiles.end(), file);
        if (it != lastfiles.end())
                lastfiles.erase(it);
-       lastfiles.push_front(file);
+       lastfiles.insert(lastfiles.begin(), file);
        if (lastfiles.size() > num_lastfiles)
                lastfiles.pop_back();
 }
@@ -151,6 +150,16 @@ void LastOpenedSection::write(ostream & os) const
 void LastOpenedSection::add(FileName const & file, bool active)
 {
        LastOpenedFile lof(file, active);
+       // check if file is already recorded (this can happen
+       // with multiple buffer views). We do only record each
+       // file once, since we cannot restore multiple views
+       // currently, we even crash in some cases (see #9483).
+       // FIXME: Add session support for multiple views of
+       //        the same buffer (split-view etc.).
+       for (size_t i = 0; i < lastopened.size(); ++i) {
+               if (lastopened[i].file_name == file)
+                       return;
+       }
        lastopened.push_back(lof);
 }
 
@@ -278,7 +287,7 @@ void BookmarksSection::read(istream & is)
 void BookmarksSection::write(ostream & os) const
 {
        os << '\n' << sec_bookmarks << '\n';
-       for (size_t i = 1; i <= max_bookmarks; ++i) {
+       for (size_t i = 0; i <= max_bookmarks; ++i) {
                if (isValid(i))
                        os << i << ", "
                           << bookmarks[i].bottom_pit << ", "
@@ -381,7 +390,7 @@ Session::Session(unsigned int num_last_files, unsigned int num_last_commands) :
 {
        // locate the session file
        // note that the session file name 'session' is hard-coded
-       session_file = FileName(addName(package().user_support().absFilename(), "session"));
+       session_file = FileName(addName(package().user_support().absFileName(), "session"));
        //
        readFile();
 }