Merge remote-tracking branch 'origin/KDE/4.11' into KDE/4.12

1 files changed, 3 insertions, 1 deletions

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index d0a85b3e2..1416bb6df 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -1486,7 +1486,9 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con
             }
 
             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)));
             }
         }