Skip to content

Commit 5fd89fa

Browse files
committed
Display warning activity instead of error, when aborting the sync.
Signed-off-by: allexzander <blackslayer4@gmail.com>
1 parent 7be9cdb commit 5fd89fa

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

src/libsync/syncengine.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,19 +1056,18 @@ void SyncEngine::switchToVirtualFiles(const QString &localPath, SyncJournalDb &j
10561056

10571057
void SyncEngine::abort()
10581058
{
1059-
if (_propagator)
1060-
qCInfo(lcEngine) << "Aborting sync";
1061-
10621059
if (_propagator) {
10631060
// If we're already in the propagation phase, aborting that is sufficient
1061+
qCInfo(lcEngine) << "Aborting sync in propagator...";
10641062
_propagator->abort();
10651063
} else if (_discoveryPhase) {
10661064
// Delete the discovery and all child jobs after ensuring
10671065
// it can't finish and start the propagator
10681066
disconnect(_discoveryPhase.data(), nullptr, this, nullptr);
10691067
_discoveryPhase.take()->deleteLater();
10701068

1071-
Q_EMIT syncError(tr("Synchronization will resume shortly."));
1069+
Q_EMIT addErrorToGui(SyncFileItem::SoftError, tr("Synchronization has been aborted."), tr("It will resume shortly."));
1070+
qCInfo(lcEngine) << "Aborting sync in discovery...";
10721071
finalize(false);
10731072
}
10741073
}

0 commit comments

Comments
 (0)