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 1f57ef4febbabca8192f548a8c5b5212bd1dddd8..962e6b4428e352ab8c82f86590d008a9ff0d0bc7 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -230,7 +230,7 @@ void DolphinContextMenu::openItemContextMenu()
 
     QAction *activatedAction = popup->exec(m_pos);
 
 
     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(),
         const KUrl selectedURL(m_fileInfo->url());
         KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"),
                                                              selectedURL.fileName(),