Prevent that Konqueror crashs if pressing F2 (= Rename) although no items are selecte...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 0b04d0afad8eb1be1cf1612bb75503c9ef34abbb..2f80682ccc23dff4e316a3312cfafc0cbdb0fa13 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -329,6 +329,17 @@ KUrl::List DolphinView::selectedUrls() const
     return urls;
 }
 
+int DolphinView::selectedItemsCount() const
+{
+    if (isColumnViewActive()) {
+        // TODO: get rid of this special case by adjusting the dir lister
+        // to the current column
+        return m_columnView->selectedItems().count();
+    }
+
+    return itemView()->selectionModel()->selection().count();
+}
+
 void DolphinView::setContentsPosition(int x, int y)
 {
     QAbstractItemView* view = itemView();
@@ -511,7 +522,12 @@ void DolphinView::changeSelection(const KFileItemList& selection)
 void DolphinView::renameSelectedItems()
 {
     const KFileItemList items = selectedItems();
-    if (items.count() > 1) {
+    const int itemCount = items.count();
+    if (itemCount < 1) {
+        return;
+    }
+    
+    if (itemCount > 1) {
         // More than one item has been selected for renaming. Open
         // a rename dialog and rename all items afterwards.
         RenameDialog dialog(this, items);
@@ -546,8 +562,6 @@ void DolphinView::renameSelectedItems()
             }
         }
     } else if (DolphinSettings::instance().generalSettings()->renameInline()) {
-        Q_ASSERT(items.count() == 1);
-
         if (isColumnViewActive()) {
             m_columnView->editItem(items.first());
         } else {
@@ -556,8 +570,6 @@ void DolphinView::renameSelectedItems()
             itemView()->edit(proxyIndex);
         }
     } else {
-        Q_ASSERT(items.count() == 1);
-
         RenameDialog dialog(this, items);
         if (dialog.exec() == QDialog::Rejected) {
             return;