From 98838fd7515f4a64d37f818b657713956cee5ae1 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 23 Mar 2019 16:55:31 -0400 Subject: [PATCH] client: show error dialog when unable to load client --- .../java/net/runelite/client/rs/ClientLoader.java | 1 - .../main/java/net/runelite/client/ui/ClientUI.java | 11 +++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index 9e81d59b00..5c96b41c25 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -211,7 +211,6 @@ public class ClientLoader } log.error("Error loading RS!", e); - System.exit(-1); return null; } } 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 59ce146601..56c3865ae4 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 @@ -52,6 +52,7 @@ import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JOptionPane; +import static javax.swing.JOptionPane.ERROR_MESSAGE; import static javax.swing.JOptionPane.INFORMATION_MESSAGE; import javax.swing.JPanel; import javax.swing.JRootPane; @@ -510,8 +511,14 @@ public class ClientUI }); // Show out of date dialog if needed - final boolean isOutdated = !(client instanceof Client); - if (isOutdated) + if (client == null) + { + SwingUtilities.invokeLater(() -> JOptionPane.showMessageDialog(frame, + "Error loading client! Check your logs for more details.", + "Unable to load client", + ERROR_MESSAGE)); + } + else if (!(client instanceof Client)) { SwingUtilities.invokeLater(() -> JOptionPane.showMessageDialog(frame, "RuneLite has not yet been updated to work with the latest\n"