Fix regression with action expiry not working.

Due to reregistration API change.

Small chance this may fix NB#259082 Sync never stops

1 files changed, 3 insertions, 1 deletions

diff --git a/src/tools/messageserver/servicehandler.cpp b/src/tools/messageserver/servicehandler.cpp
index fe05e1d4..3c71247e 100644
--- a/src/tools/messageserver/servicehandler.cpp
+++ b/src/tools/messageserver/servicehandler.cpp
@@ -1038,7 +1038,9 @@ void ServiceHandler::expireAction()
                 mActionExpiry.removeFirst();
 
                 // Restart the service(s) for each of these accounts
-                reregisterAccountServices(serviceAccounts.toList(), QMailServiceAction::Status::ErrTimeout, tr("Request is not progressing"));
+                QMailAccountIdList ids(serviceAccounts.toList());
+                deregisterAccountServices(ids, QMailServiceAction::Status::ErrTimeout, tr("Request is not progressing"));
+                registerAccountServices(ids);
 
                 // See if there are more actions to dispatch
                 dispatchRequest();