From 72c6a73e29e27b00f54b9c8156d8d0ef5b2ec634 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Tue, 2 Jan 2018 18:47:39 +0100
Subject: [PATCH] MainApplication: Fix opening session with SelectSession after
 launch action

---
 src/lib/app/mainapplication.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp
index ae23a0c36..4583658b5 100644
--- 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()));