fix linking

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index cf71bc26f6ab285dc99ee97dd218f8f62620e2cc..1af74b2e31715f0034ba6e8f8c01da5d9c9c137a 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -251,9 +251,6 @@ void DolphinContextMenu::openViewportContextMenu()
     QAction* columnsMode = m_mainWindow->actionCollection()->action("columns");
     viewModeMenu->addAction(columnsMode);
 
-    QAction* previewsMode = m_mainWindow->actionCollection()->action("previews");
-    viewModeMenu->addAction(previewsMode);
-
     popup->addMenu(viewModeMenu);
 
     popup->addSeparator();
@@ -340,7 +337,8 @@ QString DolphinContextMenu::placesName(const KUrl& url) const
 QAction* DolphinContextMenu::createPasteAction()
 {
     QAction* action = 0;
-    if ((m_selectedItems.count() == 1) && m_fileInfo.isDir()) {
+    const bool isDir = !m_fileInfo.isNull() && m_fileInfo.isDir();
+    if (isDir && (m_selectedItems.count() == 1)) {
         action = new QAction(KIcon("edit-paste"), i18nc("@action:inmenu", "Paste Into Folder"), this);
         const QMimeData* mimeData = QApplication::clipboard()->mimeData();
         const KUrl::List pasteData = KUrl::List::fromMimeData(mimeData);