Don't block unmounting when terminal panel's cwd is the mountpoint

[dolphin.git] / src / views / renamedialog.cpp

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index cf8f6885df9054b482f947038c15b64db306bd72..6309bfbdfecf6b4c95b4e996ecd3d58c2416bbe1 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -162,7 +162,12 @@ void RenameDialog::renameItem(const KFileItem &item, const QString& newName)
     KIO::Job * job = KIO::moveAs(oldUrl, newUrl, KIO::HideProgressInfo);
     KJobWidgets::setWindow(job, widget);
     KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);
     KIO::Job * job = KIO::moveAs(oldUrl, newUrl, KIO::HideProgressInfo);
     KJobWidgets::setWindow(job, widget);
     KIO::FileUndoManager::self()->recordJob(KIO::FileUndoManager::Rename, {oldUrl}, newUrl, job);

-    job->ui()->setAutoErrorHandlingEnabled(true);
+
+    if (!job->error()) {
+        m_renamedItems << newUrl;
+    }
+
+    job->uiDelegate()->setAutoErrorHandlingEnabled(true);

 }
 
 void RenameDialog::slotAccepted()
 }
 
 void RenameDialog::slotAccepted()


@@ -223,6 +228,10 @@ void RenameDialog::renameItems()
             renameItem(item, newName);
         }
     }
             renameItem(item, newName);
         }
     }

+
+    if (!m_items.empty()) {
+        emit renamingFinished(m_renamedItems);
+    }

 }
 
 QString RenameDialog::indexedName(const QString& name, int index, const QChar& indexPlaceHolder)
 }
 
 QString RenameDialog::indexedName(const QString& name, int index, const QChar& indexPlaceHolder)