[BUGFIX] happy eye: null pointer on closed socket if no connection was etablished

1 files changed, 4 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/utils/Resolver.java b/src/main/java/de/pixart/messenger/utils/Resolver.java
index bf66b38e1..0037e9563 100644
--- a/src/main/java/de/pixart/messenger/utils/Resolver.java
+++ b/src/main/java/de/pixart/messenger/utils/Resolver.java
@@ -429,7 +429,10 @@ public class Resolver {
         @Override
         public Result call() throws Exception {
             this.connect();
-            return this.socket.isConnected() ? this : null;
+            if (this.socket != null && this.socket.isConnected()) {
+                return this;
+            }
+            return null;
         }
 
         public ContentValues toContentValues() {