From 8eac37ae76a0f165be2df2dd2ba261df1c69db8d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 20 Dec 2018 12:43:21 +0100 Subject: [PATCH] Fix crash when renaming file in file system view Do not actually rename while iterating through the folders, first test, rename later. Fix-up of 0c9c747d92b7f263b386ea89d82887dc59a24773 which looks like it actually tried to do that, but confused the two method calls. Fixes: QTCREATORBUG-21741 Change-Id: I779e526e76651b61ffc75be6b4dfce1765bb758b Reviewed-by: Robert Loehning --- src/plugins/projectexplorer/foldernavigationwidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index b58b9300b83..04948cb219c 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -203,7 +203,7 @@ static QVector renamableFolderNodes(const Utils::FileName &before, ProjectTree::forEachNode([&](Node *node) { if (node->nodeType() == NodeType::File && node->filePath() == before && node->parentFolderNode() - && node->parentFolderNode()->renameFile(before.toString(), after.toString())) { + && node->parentFolderNode()->canRenameFile(before.toString(), after.toString())) { folderNodes.append(node->parentFolderNode()); } }); @@ -239,7 +239,7 @@ bool FolderNavigationModel::setData(const QModelIndex &index, const QVariant &va Utils::FileName::fromString(afterFilePath)); QVector failedNodes; for (FolderNode *folder : folderNodes) { - if (!folder->canRenameFile(beforeFilePath, afterFilePath)) + if (!folder->renameFile(beforeFilePath, afterFilePath)) failedNodes.append(folder); } if (!failedNodes.isEmpty()) {