Handle sync enable flag correctly in folder scheduling.

This fixes bug #1083.

Conflicts:
	src/mirall/folder.cpp
This commit is contained in:
Klaas Freitag 2013-10-09 14:19:34 +02:00
parent f34621578e
commit fb4728c7ee
2 changed files with 3 additions and 2 deletions

View file

@ -433,6 +433,7 @@ void Folder::slotTerminateSync()
_csyncError = true;
qDebug() << "-> CSync Terminated!";
slotCSyncFinished();
setSyncEnabled(false);
}
// This removes the csync File database if the sync folder definition is removed

View file

@ -391,8 +391,8 @@ void FolderMan::slotScheduleFolderSync()
if( _folderMap.contains( alias ) ) {
ownCloudInfo::instance()->getQuotaRequest("/");
Folder *f = _folderMap[alias];
_currentSyncFolder = alias;
if (f->syncEnabled()) {
if( f->syncEnabled() ) {
_currentSyncFolder = alias;
f->startSync( QStringList() );
}
}