From: Kevin Ottens <ervin@kde.org>
Date: Wed, 22 Nov 2006 12:22:41 +0000 (+0000)
Subject: Avoid triggering the bookmark action when it's not appropriate.
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/a08b5f835732304c7be7ebdd1627f41b16a46f3a?ds=inline

Avoid triggering the bookmark action when it's not appropriate.

svn path=/trunk/playground/utils/dolphin/; revision=606934
---

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 1f57ef4fe..962e6b442 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -230,7 +230,7 @@ void DolphinContextMenu::openItemContextMenu()
 
     QAction *activatedAction = popup->exec(m_pos);
 
-    if (activatedAction == bookmarkAction) {
+    if (bookmarkAction!=0 && activatedAction == bookmarkAction) {
         const KUrl selectedURL(m_fileInfo->url());
         KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"),
                                                              selectedURL.fileName(),