Fixed #46

Author: VioletGiraffe

file-commander-core/src/fileoperations/coperationperformer.cpp

@@ -368,6 +368,13 @@ void COperationPerformer::deleteFiles()
 	size_t currentItemIndex = 0;
 	for (auto it = _source.begin(); it != _source.end() && !_cancelRequested; _userResponse = urNone /* needed for normal condition variable operation */)
 	{
+		if (it->isCdUp())
+		{
+			++it;
+			++currentItemIndex;
+			continue;
+		}
+
 		qDebug() << __FUNCTION__ << "deleting" << (it->isFile() ? "file" : "directory") << it->fullAbsolutePath();
 		_observer->onCurrentFileChangedCallback(it->fullName());
 

qt-app/src/cmainwindow.cpp

@@ -351,6 +351,9 @@ void CMainWindow::deleteFiles()
 	for (auto& item: items)
 		paths.emplace_back(toNativeSeparators(item.fullAbsolutePath()).toStdWString());
 
+	if (paths.empty())
+		return;
+
 	if (!CShell::deleteItems(paths, true, (void*)winId()))
 		QMessageBox::critical(this, "Error deleting items", "Failed to delete the selected items");
 #else
@@ -364,10 +367,13 @@ void CMainWindow::deleteFilesIrrevocably()
 		return;
 
 	auto items = _controller->items(_currentFileList->panelPosition(), _currentFileList->selectedItemsHashes());
+	if (items.empty())
+		return;
 #ifdef _WIN32
 	std::vector<std::wstring> paths;
 	for (auto& item: items)
 		paths.emplace_back(toNativeSeparators(item.fullAbsolutePath()).toStdWString());
+
 	CShell::deleteItems(paths, false, (void*)winId());
 #else
 	if (QMessageBox::question(this, "Are you sure?", QString("Do you want to delete the selected files and folders completely?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)

qt-app/src/panel/cpanelwidget.cpp

@@ -789,14 +789,19 @@ std::vector<qulonglong> CPanelWidget::selectedItemsHashes(bool onlyHighlightedIt
 		for (auto it = selection.begin(); it != selection.end(); ++it)
 		{
 			const qulonglong hash = hashByItemIndex(*it);
-			result.push_back(hash);
+			if (!_controller.itemByHash(_panelPosition, hash).isCdUp())
+				result.push_back(hash);
 		}
 	}
 	else if (!onlyHighlightedItems)
 	{
 		auto currentIndex = _selectionModel->currentIndex();
 		if (currentIndex.isValid())
-			result.push_back(hashByItemIndex(currentIndex));
+		{
+			const auto hash = hashByItemIndex(currentIndex);
+			if (!_controller.itemByHash(_panelPosition, hash).isCdUp())
+				result.push_back(hash);
+		}
 	}
 
 	return result;