summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-08-20 12:01:08 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-08-20 12:01:08 +0200
commit50aa8fe1e513a5d9166f7a1be8d8737a46c2ef3d (patch)
treeca43b86047cc5dc6134c7bf1f9a9f5ac5b855e42 /src
parentLineEdit clear button enabled (diff)
parentFix crashing, when right-clicking on a bookmark folder in the bookmark (diff)
downloadrekonq-50aa8fe1e513a5d9166f7a1be8d8737a46c2ef3d.tar.xz
Merge commit 'pano/master'
Diffstat (limited to 'src')
-rw-r--r--src/bookmarks.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bookmarks.cpp b/src/bookmarks.cpp
index c9db4a9b..a1f0e441 100644
--- a/src/bookmarks.cpp
+++ b/src/bookmarks.cpp
@@ -261,6 +261,8 @@ void BookmarkProvider::contextMenu(const QPoint &point)
if (!action)
return;
KMenu *menu = m_bookmarkMenu->viewContextMenu(action);
+ if (!menu)
+ return;
menu->popup(m_bookmarkToolBar->mapToGlobal(point));
}