From c5be2dc2af30ba2b729727230386d19ac3a3f6f5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 18 Apr 2022 10:56:35 +0200
Subject: [PATCH] Small improvements

---
 app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 8bc2b88133..2a54d99533 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -2314,12 +2314,14 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                     EntityLog.log(this, EntityLog.Type.Account, account,
                             account.name + " closing");
 
+                    // Cancel purge
                     getMainHandler().removeCallbacks(purge);
 
                     // Stop watching operations
                     Log.i(account.name + " stop watching operations");
                     final TwoStateOwner _owner = cowner.value;
-                    if (_owner != null)
+                    if (_owner != null) {
+                        cowner.value = null;
                         getMainHandler().post(new RunnableEx("observe#stop") {
                             @Override
                             public void delegate() {
@@ -2330,6 +2332,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                 }
                             }
                         });
+                    }
 
                     // Stop executing operations
                     Log.i(account.name + " stop executing operations");