From 3d6390a76a975eae281876045d616ce32c4b3af9 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Wed, 25 Nov 2020 16:51:57 +0100
Subject: [PATCH] Set the ping to null when canceling manually as well

---
 core/src/mindustry/ui/dialogs/JoinDialog.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index 62cc2e9391..155945fc0f 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -469,10 +469,12 @@ public class JoinDialog extends BaseDialog{
                 connect(lastIp, lastPort);
             }, exception -> {});
         }, 1, 1);
-
+        
         ui.loadfrag.setButton(() -> {
             ui.loadfrag.hide();
-            if(ping != null) ping.cancel();
+            if(ping == null) return;
+            ping.cancel();
+            ping = null;
         });
     }