From 9d5a51c054def5a565675cfbff9cb07720c20dc2 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Tue, 1 Aug 2017 13:27:03 +0200
Subject: skip initial socket closing if thread was already interrupted

---
 src/main/java/de/pixart/messenger/xmpp/XmppConnection.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de')

diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
index 1976bdc4a..084040db1 100644
--- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
@@ -525,7 +525,13 @@ public class XmppConnection implements Runnable {
 
     @Override
     public void run() {
-        forceCloseSocket();
+        synchronized (this) {
+            if (Thread.currentThread().isInterrupted()) {
+                Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": aborting connect because thread was interrupted");
+                return;
+            }
+            forceCloseSocket();
+        }
         connect();
     }
 
-- 
cgit v1.2.3