diff options
| -rw-r--r-- | src/tabbar.cpp | 4 | ||||
| -rw-r--r-- | src/webpage.cpp | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/tabbar.cpp b/src/tabbar.cpp index 12745772..7326d7af 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -153,8 +153,8 @@ void TabBar::showTabPreview(int tab) WebTab *view = mv->webTab(tab); WebTab *currentView = mv->webTab(currentIndex()); - // should fix bug #212219 - if(!currentView) + // check if view && currentView exist before using them :) + if(!currentView || !view) return; int w = tabSizeHint(tab).width(); diff --git a/src/webpage.cpp b/src/webpage.cpp index 4cc9bbe3..b2bedffc 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -73,11 +73,19 @@ WebPage::WebPage(QObject *parent) : KWebPage(parent, KWalletIntegration) { - // rekonq own classes integration - setNetworkAccessManager(new NetworkAccessManager(this)); + setForwardUnsupportedContent(true); + + // rekonq Network Manager + NetworkAccessManager *manager = new NetworkAccessManager(this); + + // disable QtWebKit cache to just use KIO one.. + manager->setCache(0); + + setNetworkAccessManager(manager); + + // Web Plugin Factory setPluginFactory(new WebPluginFactory(this)); - setForwardUnsupportedContent(true); connect(networkAccessManager(), SIGNAL(finished(QNetworkReply*)), this, SLOT(manageNetworkErrors(QNetworkReply*))); |