ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

client: show error dialog when unable to load client

Browse Source
This commit is contained in:
Adam
2019-03-23 16:55:31 -04:00
parent b8503e0326
commit 98838fd751
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
View File

@@ -211,7 +211,6 @@ public class ClientLoader
} }
log.error("Error loading RS!", e); log.error("Error loading RS!", e);
System.exit(-1);
return null; return null;
} }
} }

11
runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
View File

@@ -52,6 +52,7 @@ import javax.swing.JButton;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import static javax.swing.JOptionPane.ERROR_MESSAGE;
import static javax.swing.JOptionPane.INFORMATION_MESSAGE; import static javax.swing.JOptionPane.INFORMATION_MESSAGE;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JRootPane; import javax.swing.JRootPane;
@@ -510,8 +511,14 @@ public class ClientUI
}); });
// Show out of date dialog if needed // Show out of date dialog if needed
final boolean isOutdated = !(client instanceof Client); if (client == null)
if (isOutdated) {
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, SwingUtilities.invokeLater(() -> JOptionPane.showMessageDialog(frame,
"RuneLite has not yet been updated to work with the latest\n" "RuneLite has not yet been updated to work with the latest\n"