From 40e6604cae644676261beb2a588cfe92d57023fe Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 22 Jul 2017 14:04:29 -0400 Subject: [PATCH] runelite-client: only prompt on close if logged in --- .../main/java/net/runelite/client/ui/ClientUI.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java index 621c9ef914..4d6f03c447 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java @@ -35,6 +35,8 @@ import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; +import net.runelite.api.Client; +import net.runelite.api.GameState; import net.runelite.client.RuneLite; public final class ClientUI extends JFrame @@ -129,7 +131,14 @@ public final class ClientUI extends JFrame private void checkExit() { - int result = JOptionPane.showConfirmDialog(this, "Are you sure you want to exit?", "Exit", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); + Client client = RuneLite.getClient(); + int result = JOptionPane.OK_OPTION; + + // only ask if not logged out + if (client != null && client.getGameState() != GameState.LOGIN_SCREEN) + { + result = JOptionPane.showConfirmDialog(this, "Are you sure you want to exit?", "Exit", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); + } if (result == JOptionPane.OK_OPTION) {