From b9e4b6cb755b618db310635d45e5f737065de61d Mon Sep 17 00:00:00 2001
From: RaphiMC <50594595+RaphiMC@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:52:18 +0100
Subject: [PATCH] Added null check to closePopup method

---
 .../net/raphimc/viaproxy/ui/impl/AccountsTab.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/raphimc/viaproxy/ui/impl/AccountsTab.java b/src/main/java/net/raphimc/viaproxy/ui/impl/AccountsTab.java
index 61b573c..2133559 100644
--- a/src/main/java/net/raphimc/viaproxy/ui/impl/AccountsTab.java
+++ b/src/main/java/net/raphimc/viaproxy/ui/impl/AccountsTab.java
@@ -218,11 +218,13 @@ public class AccountsTab extends AUITab {
         if (!model.isEmpty()) this.markSelected(0);
     }
 
-    private void closePopup() {
-        this.addAccountPopup.markExternalClose();
-        this.addAccountPopup.setVisible(false);
-        this.addAccountPopup.dispose();
-        this.addAccountPopup = null;
+    private void closePopup() { // Might be getting called multiple times
+        if (this.addAccountPopup != null) {
+            this.addAccountPopup.markExternalClose();
+            this.addAccountPopup.setVisible(false);
+            this.addAccountPopup.dispose();
+            this.addAccountPopup = null;
+        }
         this.addMicrosoftAccountButton.setEnabled(true);
         this.addBedrockAccountButton.setEnabled(true);
     }