summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-02-03 12:39:20 +0100
committerAndrea Diamantini <adjam7@gmail.com>2012-02-03 12:39:20 +0100
commitf3c918f6970cdcd4b024305baa8542e8c9700212 (patch)
tree9c40ba20a17c28945609895df04352cfed03129c /src
parentrekonq 0.8.73 (diff)
parentGet sure pdfs are loaded when restoring sessions (diff)
downloadrekonq-f3c918f6970cdcd4b024305baa8542e8c9700212.tar.xz
Merge branch 'FirstFebFixes'
Diffstat (limited to 'src')
-rw-r--r--src/sessionmanager.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp
index 0ef0b827..0557fcb4 100644
--- a/src/sessionmanager.cpp
+++ b/src/sessionmanager.cpp
@@ -172,6 +172,9 @@ bool SessionManager::restoreSessionFromScratch()
KUrl u = KUrl(tab.attribute("url"));
if (u.protocol() == QL1S("about"))
continue;
+
+ // This is needed for particular URLs, eg pdfs
+ view->load(u);
}
mv->tabBar()->setCurrentIndex(currentTab);
@@ -209,10 +212,9 @@ void SessionManager::restoreCrashedSession()
QDataStream readingStream(&history, QIODevice::ReadOnly);
readingStream >> *(view->history());
- // Get sure about urls are loaded
+ // Get sure about urls and/or pdf are loaded
KUrl u = KUrl(tab.attribute("url"));
- if (u.protocol() == QL1S("about"))
- view->load(u);
+ view->load(u);
}
mv->tabBar()->setCurrentIndex(currentTab);
}
@@ -251,10 +253,9 @@ int SessionManager::restoreSavedSession()
QDataStream readingStream(&history, QIODevice::ReadOnly);
readingStream >> *(view->history());
- // Get sure about urls are loaded
+ // Get sure about urls and/or pdfs are loaded
KUrl u = KUrl(tab.attribute("url"));
- if (u.protocol() == QL1S("about"))
- view->load(u);
+ view->load(u);
}
mv->tabBar()->setCurrentIndex(currentTab);
}