MainApplication: Fix opening session with SelectSession after launch action

8 years ago · 72c6a73e29
parent 1aa4b41151
commit 72c6a73e29
1 changed files with 5 additions and 3 deletions
--- a/src/lib/app/mainapplication.cpp
+++ b/src/lib/app/mainapplication.cpp
@ -322,12 +322,14 @@ MainApplication::MainApplication(int &argc, char** argv)

        if (m_isStartingAfterCrash || afterLaunch() == RestoreSession) {
            m_restoreManager = new RestoreManager(sessionManager()->lastActiveSessionPath());
-            if (m_restoreManager->isValid()) {
-                restoreSession(window, m_restoreManager->restoreData());
-            } else {
+            if (!m_restoreManager->isValid()) {
                destroyRestoreManager();
            }
        }
+
+        if (!m_isStartingAfterCrash && m_restoreManager) {
+            restoreSession(window, m_restoreManager->restoreData());
+        }
    }

    QTimer::singleShot(0, this, SLOT(postLaunch()));