From: Peter Penz Date: Sun, 3 Aug 2008 10:01:53 +0000 (+0000) Subject: Prevent that Konqueror crashs if pressing F2 (= Rename) although no items are selecte... X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/d673ccac4dec1e81f3a3ed5a1c2081cce3724e62 Prevent that Konqueror crashs if pressing F2 (= Rename) although no items are selected. TODO: disable the rename action (and other selection dependent actions) when no items are selected. BUG: 168183 svn path=/trunk/KDE/kdebase/apps/; revision=841418 --- diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 97bce5aac..2f80682cc 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -522,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); @@ -557,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 { @@ -567,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;