diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2013-07-31 17:37:18 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2013-07-31 17:37:18 +0200 |
| commit | aad9aad70388c0b7e267ec340ffe963e742af69c (patch) | |
| tree | 02b78609243e7a8d6b44ad54c3f2e6fd12d86dbd | |
| parent | Load the adblock settings in background. (diff) | |
| download | rekonq-aad9aad70388c0b7e267ec340ffe963e742af69c.tar.xz | |
Restore history tab. Fix regression.
BUG: 322994
| -rw-r--r-- | src/tabwindow/tabwidget.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/tabwindow/tabwidget.cpp b/src/tabwindow/tabwidget.cpp index 3b06350d..59943423 100644 --- a/src/tabwindow/tabwidget.cpp +++ b/src/tabwindow/tabwidget.cpp @@ -655,7 +655,7 @@ void TabWidget::closeTab(int index, bool del) } if (!tabToClose->url().isEmpty() - && tabToClose->url().scheme() != QL1S("rekonq") +// && tabToClose->url().scheme() != QL1S("rekonq") && !tabToClose->page()->settings()->testAttribute(QWebSettings::PrivateBrowsingEnabled) ) { @@ -823,8 +823,12 @@ void TabWidget::restoreClosedTab(int index, bool inNewTab) tab = currentWebWindow(); } - tab->load(u); + // apply history again + history.applyHistory(tab->page()->history()); + if (u.scheme() == QL1S("rekonq")) + tab->load(u); + // just to get sure... m_recentlyClosedTabs.removeAll(history); } |