Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

WebTab: Fix pinning tabs that are not yet restored

Browse Source
This commit is contained in:
David Rosca 2015-10-05 23:39:59 +02:00
parent 9fd7c271e4
commit 1a87d443c0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/app/mainapplication.cpp
View File

@ -304,10 +304,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"));
}
}

5
src/lib/webtab/webtab.cpp
View File

@ -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();
@ -322,7 +324,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()