From a309167dc747072830ad47b979c926e9083e6f63 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 19 Mar 2011 09:44:28 +0100 Subject: Check if mainWindow and currentab really exist before using in bookmarksprovider. In fact now this is NOT automagically ensured there (as in any non widget rekonq class) BUG:268838 --- src/bookmarks/bookmarkprovider.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/bookmarks') diff --git a/src/bookmarks/bookmarkprovider.cpp b/src/bookmarks/bookmarkprovider.cpp index 1bcff5eb..9049c305 100644 --- a/src/bookmarks/bookmarkprovider.cpp +++ b/src/bookmarks/bookmarkprovider.cpp @@ -201,7 +201,7 @@ void BookmarkProvider::slotBookmarksChanged() fillBookmarkBar(bookmarkToolBar); } } - if (rApp->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")) + if (rApp->mainWindow() && rApp->mainWindow()->currentTab() && rApp->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")) rApp->loadUrl(KUrl("about:bookmarks"), Rekonq::CurrentTab); } @@ -250,7 +250,7 @@ void BookmarkProvider::slotPanelChanged() if (panel && panel != sender()) panel->loadFoldedState(); } - if (rApp->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")) + if (rApp->mainWindow() && rApp->mainWindow()->currentTab() && rApp->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")) rApp->loadUrl(KUrl("about:bookmarks"), Rekonq::CurrentTab); } -- cgit v1.2.1