CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better skin fix error handling

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2022-11-20 09:55:30 +00:00
parent ead59c0246
commit bfa5fe1598
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/launcher/org/prismlauncher/fix/Fixes.java
View File

@ -40,6 +40,7 @@ import java.util.List;
import org.prismlauncher.fix.skins.SkinFix; import org.prismlauncher.fix.skins.SkinFix;
import org.prismlauncher.utils.Parameters; import org.prismlauncher.utils.Parameters;
import org.prismlauncher.utils.logging.Log;
public final class Fixes { public final class Fixes {
@ -48,9 +49,15 @@ public final class Fixes {
public static void apply(Parameters params) { public static void apply(Parameters params) {
List<String> fixes = params.getList("fixes", Collections.<String>emptyList()); List<String> fixes = params.getList("fixes", Collections.<String>emptyList());
for (Fix fix : FIXES) for (Fix fix : FIXES) {
if (fixes.contains(fix.getName()) && fix.isApplicable(params)) if (fixes.contains(fix.getName()) && fix.isApplicable(params)) {
fix.apply(); try {
fix.apply();
} catch (Throwable e) {
Log.error("Could not apply " + fix.getName(), e);
}
}
}
} }
} }

8
libraries/launcher/org/prismlauncher/fix/skins/SkinFix.java
View File

@ -71,7 +71,13 @@ public final class SkinFix implements Fix, URLStreamHandlerFactory {
@Override @Override
public void apply() { public void apply() {
URL.setURLStreamHandlerFactory(this); try {
URL.setURLStreamHandlerFactory(this);
} catch (Error e) {
Log.warning("Cannot apply skin fix");
Log.warning("URLStreamHandlerFactory is already set");
Log.warning("Turning off legacy skin fix in Settings > Miscellaneous will silence the warnings");
}
} }
@Override @Override