mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-17 15:31:20 +00:00
Merge remote-tracking branch 'origin/KDE/4.11' into KDE/4.12
This commit is contained in:
commit
f3537f5b5f
|
@ -1486,7 +1486,9 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con
|
||||||
}
|
}
|
||||||
|
|
||||||
KonqOperations* op = KonqOperations::renameV2(this, oldUrl, newName);
|
KonqOperations* op = KonqOperations::renameV2(this, oldUrl, newName);
|
||||||
if (op) {
|
if (op && !newNameExistsAlready) {
|
||||||
|
// Only connect the renamingFailed signal if there is no item with the new name
|
||||||
|
// in the model yet, see bug 328262.
|
||||||
connect(op, SIGNAL(renamingFailed(KUrl,KUrl)), SLOT(slotRenamingFailed(KUrl,KUrl)));
|
connect(op, SIGNAL(renamingFailed(KUrl,KUrl)), SLOT(slotRenamingFailed(KUrl,KUrl)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue