Schedule a new folder when wen we remove the current running folder

Fixes: #9969

changelog/unreleased/9969

@@ -0,0 +1,5 @@
+Bugfix: Run next scheduled sync after a folder was removed
+
+We fixed a bug where we did not start another sync when a folder that was currently syncing was removed.
+
+https://github.com/owncloud/client/issues/9969

src/gui/folderman.cpp

@@ -160,7 +160,7 @@ FolderMan::FolderMan(QObject *parent)
     connect(&_startScheduledSyncTimer, &QTimer::timeout,
         this, &FolderMan::slotStartScheduledFolderSync);
 
-    _timeScheduler.setInterval(5000);
+    _timeScheduler.setInterval(5s);
     _timeScheduler.setSingleShot(false);
     connect(&_timeScheduler, &QTimer::timeout,
         this, &FolderMan::slotScheduleFolderByTime);
@@ -1206,21 +1206,14 @@ void FolderMan::removeFolder(Folder *f)
     f->removeFromSettings();
 
     unloadFolder(f);
-    if (currentlyRunning) {
-        // We want to schedule the next folder once this is done
-        connect(f, &Folder::syncFinished,
-            this, &FolderMan::slotFolderSyncFinished);
-        // Let the folder delete itself when done.
-        connect(f, &Folder::syncFinished, f, &QObject::deleteLater);
-    } else {
-        f->deleteLater();
-    }
+    f->deleteLater();
 
 #ifdef Q_OS_WIN
     _navigationPaneHelper.scheduleUpdateCloudStorageRegistry();
 #endif
     Q_EMIT folderRemoved(f);
     emit folderListChanged(_folderMap);
+    QTimer::singleShot(0, this, &FolderMan::startScheduledSyncSoon);
 }
 
 QString FolderMan::getBackupName(QString fullPathName) const

src/gui/folderman.h

@@ -354,7 +354,7 @@ private slots:
     QSet<Folder *> _disabledFolders;
     QMap<QString, Folder *> _folderMap;
     QString _folderConfigPath;
-    Folder *_currentSyncFolder;
+    QPointer<Folder> _currentSyncFolder;
     QPointer<Folder> _lastSyncFolder;
     bool _syncEnabled;