1 files changed, 6 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 d0985edce..e159c3dd0 100644
--- a/src/main/java/de/pixart/messenger/utils/Resolver.java
+++ b/src/main/java/de/pixart/messenger/utils/Resolver.java
@@ -122,7 +122,12 @@ public class Resolver {
                 }
             }
         } catch (InterruptedException e) {
-            return results;
+            for (Thread thread : threads) {
+                thread.interrupt();
+            }
+            synchronized (results) {
+                return new ArrayList<>(results);
+            }
         }
     }