From cdbcd30d1554cc1b179ddbe9a0ef14e085421c1e Mon Sep 17 00:00:00 2001 From: Xavier Michelon Date: Thu, 5 Oct 2023 11:33:09 +0200 Subject: [PATCH] fix(GODT-2490): fix sync progress not being reset when toggling split mode. --- internal/frontend/bridge-gui/bridgepp/bridgepp/User/User.cpp | 2 ++ internal/frontend/grpc/service.go | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/internal/frontend/bridge-gui/bridgepp/bridgepp/User/User.cpp b/internal/frontend/bridge-gui/bridgepp/bridgepp/User/User.cpp index 85b0b7f4..ed4609e5 100644 --- a/internal/frontend/bridge-gui/bridgepp/bridgepp/User/User.cpp +++ b/internal/frontend/bridge-gui/bridgepp/bridgepp/User/User.cpp @@ -309,6 +309,8 @@ void User::setIsSyncing(bool syncing) { } isSyncing_ = syncing; + syncProgress_ = 0; + emit isSyncingChanged(syncing); } diff --git a/internal/frontend/grpc/service.go b/internal/frontend/grpc/service.go index bb59784d..f197d08c 100644 --- a/internal/frontend/grpc/service.go +++ b/internal/frontend/grpc/service.go @@ -340,6 +340,11 @@ func (s *Service) watchEvents() { case events.SyncFinished: _ = s.SendEvent(NewSyncFinishedEvent(event.UserID)) + case events.SyncFailed: + if errors.Is(event.Error, context.Canceled) { + _ = s.SendEvent(NewSyncFinishedEvent(event.UserID)) + } + case events.SyncProgress: _ = s.SendEvent(NewSyncProgressEvent(event.UserID, event.Progress, event.Elapsed.Milliseconds(), event.Remaining.Milliseconds()))