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

clientloader: don't use fallback config or client when jav_config is manually specified

Browse Source
This commit is contained in:
Adam
2021-05-11 19:19:21 -04:00
parent ab7023fac5
commit 52dc8f85a7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ public class ClientLoader implements Supplier<Applet>
catch (IOException ex) catch (IOException ex)
{ {
// try again with the fallback config and gamepack // try again with the fallback config and gamepack
if (!config.isFallback()) if (javConfigUrl.equals(RuneLiteProperties.getJavConfig()) && !config.isFallback())
{ {
log.warn("Unable to download game client, attempting to use fallback config", ex); log.warn("Unable to download game client, attempting to use fallback config", ex);
config = downloadFallbackConfig(); config = downloadFallbackConfig();
@@ -404,7 +404,7 @@ public class ClientLoader implements Supplier<Applet>
log.warn("Failed to download gamepack from \"{}\"", url, e); log.warn("Failed to download gamepack from \"{}\"", url, e);
// With fallback config do 1 attempt (there are no additional urls to try) // With fallback config do 1 attempt (there are no additional urls to try)
if (config.isFallback() || attempt >= NUM_ATTEMPTS) if (!javConfigUrl.equals(RuneLiteProperties.getJavConfig()) || config.isFallback() || attempt >= NUM_ATTEMPTS)
{ {
throw e; throw e;
} }