always force close a connection when disabling from error state

2 files changed, 5 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/Account.java b/src/main/java/de/pixart/messenger/entities/Account.java
index fb1839d85..d2295e2db 100644
--- a/src/main/java/de/pixart/messenger/entities/Account.java
+++ b/src/main/java/de/pixart/messenger/entities/Account.java
@@ -341,6 +341,10 @@ public class Account extends AbstractEntity {
         }
     }
 
+    public State getTrueStatus() {
+        return this.status;
+    }
+
     public void setStatus(final State status) {
         this.status = status;
     }
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index bb028b354..8f83851bd 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -3059,7 +3059,7 @@ public class XmppConnectionService extends Service {
                 thread.start();
                 scheduleWakeUpCall(Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode());
             } else {
-                disconnect(account, force);
+                disconnect(account, force || account.getTrueStatus().isError());
                 account.getRoster().clearPresences();
                 connection.resetEverything();
                 account.getAxolotlService().resetBrokenness();