Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #26: xdg spec

Browse Source
This commit is contained in:
zjeffer
2021-12-29 17:08:51 +00:00
committed by Sheepit Renderfarm
parent 6da387a288
commit ba1f865316
3 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/sheepit/client/SettingsLoader.java
View File

@@ -38,6 +38,9 @@ import com.sheepit.client.hardware.gpu.GPU;
import com.sheepit.client.hardware.gpu.GPUDevice;
import com.sheepit.client.standalone.GuiText;
import com.sheepit.client.standalone.GuiTextOneLine;
import com.sheepit.client.os.OS;
import com.sheepit.client.os.Linux;
import com.sheepit.client.os.Mac;
import lombok.Data;
@Data
@@ -128,7 +131,7 @@ public class SettingsLoader {
public SettingsLoader(String path_) {
if (path_ == null) {
path = getDefaultFilePath();
path = OS.getOS().getDefaultConfigFilePath();
}
else {
path = path_;
@@ -140,7 +143,7 @@ public class SettingsLoader {
Integer maxRenderTime_, String cacheDir_, Boolean autoSignIn_, Boolean useSysTray_, Boolean isHeadless,
String ui_, String theme_, Integer priority_) {
if (path_ == null) {
path = getDefaultFilePath();
path = OS.getOS().getDefaultConfigFilePath();
}
else {
path = path_;
@@ -197,10 +200,6 @@ public class SettingsLoader {
return option;
}
public static String getDefaultFilePath() {
return System.getProperty("user.home") + File.separator + ".sheepit.conf";
}
public String getFilePath() {
return path;
}