WebTab: Fix pinning tabs that are not yet restored

QupZilla · Oct 5, 2015 · 73efdcf · 73efdcf
1 parent c8400d0
commit 73efdcf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp
@@ -291,10 +291,10 @@ MainApplication::MainApplication(int &argc, char** argv)
  m_restoreManager = new RestoreManager();
  if (!m_restoreManager->isValid()) {
  destroyRestoreManager();
+ } else {
+ // Pinned tabs are saved into session.dat, so remove the old saved pinned tabs
+ QFile::remove(DataPaths::currentProfilePath() + QL1S("/pinnedtabs.dat"));
  }
-
- // Pinned tabs are saved into session.dat, so remove the old saved pinned tabs
- QFile::remove(DataPaths::currentProfilePath() + QL1S("/pinnedtabs.dat"));
  }
  }
 

diff --git a/src/lib/webtab/webtab.cpp b/src/lib/webtab/webtab.cpp
@@ -287,7 +287,9 @@ void WebTab::restoreTab(const WebTab::SavedTab &tab)
 {
  Q_ASSERT(m_tabBar);
 
- if (!tab.isPinned && qzSettings->loadTabsOnActivation) {
+ m_isPinned = tab.isPinned;
+
+ if (!m_isPinned && qzSettings->loadTabsOnActivation) {
  m_savedTab = tab;
  int index = tabIndex();
 
@@ -324,7 +326,6 @@ void WebTab::p_restoreTab(const QUrl &url, const QByteArray &history)
 void WebTab::p_restoreTab(const WebTab::SavedTab &tab)
 {
  p_restoreTab(tab.url, tab.history);
- m_isPinned = tab.isPinned;
 }
 
 QPixmap WebTab::renderTabPreview()