mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 06:45:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Discovery: Fix aborting during discovery #6972

Browse source
This commit is contained in:
Christian Kamm 2019-01-14 15:41:34 +01:00 committed by Kevin Ottens
parent 836d298141
commit 9f8505c736
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libsync/syncengine.cpp
View file

@ -1033,14 +1033,17 @@ void SyncEngine::abort()
if (_propagator)
qCInfo(lcEngine) << "Aborting sync";
// Aborts the discovery phase job
if (_discoveryPhase) {
// Should take care to delete all children jobs
_discoveryPhase.take()->deleteLater();
}
// For the propagator
if (_propagator) {
// If we're already in the propagation phase, aborting that is sufficient
_propagator->abort();
} else if (_discoveryPhase) {
// Delete the discovery and all child jobs after ensuring
// it can't finish and start the propagator
disconnect(_discoveryPhase.data(), 0, this, 0);
_discoveryPhase.take()->deleteLater();
syncError(tr("Aborted"));
finalize(false);
}
}