From f28da4407faf96b1e77fd4a1c8c0e3f471d51046 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 28 Sep 2015 14:34:21 +0200 Subject: [PATCH] Remove pinnedtabs.dat on startup, not when saving session --- src/lib/app/mainapplication.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index 421e3e7fe..ff143a899 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -305,6 +305,9 @@ MainApplication::MainApplication(int &argc, char** argv) if (!m_restoreManager->isValid()) { destroyRestoreManager(); } + + // Pinned tabs are saved into session.dat, so remove the old saved pinned tabs + QFile::remove(DataPaths::currentProfilePath() + QL1S("/pinnedtabs.dat")); } } @@ -716,11 +719,7 @@ void MainApplication::saveSession() int afterLaunch = Settings().value("Web-URL-Settings/afterLaunch", 3).toInt(); - if (afterLaunch == 3) { - // Pinned tabs are saved into session.dat, so remove the old saved pinned tabs - QFile::remove(DataPaths::currentProfilePath() + QL1S("/pinnedtabs.dat")); - } - else { + if (afterLaunch != 3) { // Pinned tabs are saved only for last window into pinnedtabs.dat BrowserWindow* qupzilla_ = getWindow(); if (qupzilla_ && m_windows.count() == 1) {