Do not remove watched directories.

diff --git a/localmylist/renamehandler.cpp b/localmylist/renamehandler.cpp
index a3c6ef5bd82a2af1b5b004d206ca869d95e4c4fc..75fc24a2ab68422bb0ed54b891beb01b9eab054b 100644 (file)
--- a/localmylist/renamehandler.cpp
+++ b/localmylist/renamehandler.cpp
@@ -56,6 +56,8 @@ void RenameHandler::handleRename()
 
        t.commit();
 
+       QStringList watchedDirectories = db->getWatchedDirectories(MyList::instance()->hostId());
+
        while (q.next())
        {
                QSqlRecord r = q.record();
@@ -184,6 +186,12 @@ void RenameHandler::handleRename()
                dir.setFilter(QDir::NoDotAndDotDot | QDir::AllEntries);
                while (!dir.count())
                {
+                       for (const QString &path : watchedDirectories)
+                       {
+                               QDir watchedDirectory(path);
+                               if (dir.canonicalPath() == watchedDirectory.canonicalPath())
+                                       goto endDirRemove;
+                       }
                        // QDir::rmdir only removes empty directories
                        if (!dir.rmdir(dir.canonicalPath()))
                        {
@@ -193,6 +201,7 @@ void RenameHandler::handleRename()
                        if (!dir.cdUp())
                                break;
                }
+endDirRemove: ;
        }
 
        emit renameBatchFinished();