From c506678433df31b92b3bfa377d8f6a1cae199c5b Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 13 Nov 2019 14:29:45 +0100 Subject: [PATCH] Prevent NPE This can happen on a disconnect event before start --- app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index f76b1f284b..6041822848 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -678,8 +678,10 @@ public class ServiceSynchronize extends ServiceBase { private void stop() { EntityLog.log(this, "Main stop"); - state.stop(); - state.join(); + if (state != null) { + state.stop(); + state.join(); + } EntityLog.log(this, "Main stopped");