mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

If a sync folder is removed, terminate if its currently running.

Browse Source
This commit is contained in:
Klaas Freitag 2012-05-14 11:09:01 +02:00
parent 9202d66590
commit 64e94708df
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mirall/folderman.cpp
View File

@ -26,8 +26,7 @@
namespace Mirall {
FolderMan::FolderMan(QObject *parent) :
QObject(parent),
_folderToDelete(false)
QObject(parent)
{
// if QDir::mkpath would not be so stupid, I would not need to have this
// duplication of folderConfigPath() here
@ -305,13 +304,6 @@ void FolderMan::slotFolderSyncFinished( const SyncResult& )
{
qDebug() << "<===================================== sync finsihed for " << _currentSyncFolder;
// check if the folder is scheduled to be deleted. The flag is set in slotRemoveFolder
// after the user clicked to delete it.
if( _folderToDelete ) {
qDebug() << " !! This folder is going to be deleted now!";
removeFolder( _currentSyncFolder );
_folderToDelete = false;
}
_currentSyncFolder.clear();
QTimer::singleShot(200, this, SLOT(slotScheduleFolderSync()));
}
@ -346,11 +338,10 @@ void FolderMan::slotRemoveFolder( const QString& alias )
if( alias.isEmpty() ) return;
if( _currentSyncFolder == alias ) {
// attention: sync is currently running!
_folderToDelete = true; // flag for the sync finished slot
} else {
removeFolder(alias);
// terminate if the sync is currently underway.
terminateSyncProcess( alias );
}
removeFolder(alias);
}
// remove a folder from the map. Should be sure n

1
src/mirall/folderman.h
View File

@ -108,7 +108,6 @@ private:
QSignalMapper *_folderChangeSignalMapper;
QString _currentSyncFolder;
QStringList _scheduleQueue;
bool _folderToDelete;
};
}