Skip to content

Check that a shader is selected before setting "shadersEnabled" to true #2802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lolothepro wants to merge 1 commit into
base: multiloader-new
Choose a base branch
from
+6 −1
Open

Check that a shader is selected before setting "shadersEnabled" to true #2802

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion common/src/main/java/net/irisshaders/iris/config/IrisConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class IrisConfig {

public IrisConfig(Path propertiesPath, Path excluded) {
shaderPackName = null;
enableShaders = true;
enableShaders = false;
allowUnknownShaders = false;
enableDebugOptions = false;
disableUpdateMessage = false;
Expand Down Expand Up @@ -99,6 +99,7 @@ public Optional<String> getShaderPackName() {
public void setShaderPackName(String name) {
if (name == null || name.equals("(internal)") || name.isEmpty()) {
this.shaderPackName = null;
this.enableShaders = false;
} else {
this.shaderPackName = name;
}
Expand Down Expand Up @@ -189,6 +190,10 @@ public void load() throws IOException {
shaderPackName = null;
}
}

if (shaderPackName == null) {
enableShaders = false;
}
}

/**
Expand Down