lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when user set common directory to an invalid path

Browse Source
This commit is contained in:
huanghongxun
2018-09-26 19:00:31 +08:00
parent 5f686f7205
commit 5a0e17b121
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java
View File

@@ -17,11 +17,15 @@
*/ */
package org.jackhuang.hmcl.setting; package org.jackhuang.hmcl.setting;
import javafx.beans.binding.Bindings;
import javafx.scene.text.Font; import javafx.scene.text.Font;
import org.jackhuang.hmcl.Launcher; import org.jackhuang.hmcl.Launcher;
import org.jackhuang.hmcl.game.HMCLCacheRepository; import org.jackhuang.hmcl.game.HMCLCacheRepository;
import org.jackhuang.hmcl.util.CacheRepository; import org.jackhuang.hmcl.util.CacheRepository;
import java.nio.file.InvalidPathException;
import java.nio.file.Paths;
import static org.jackhuang.hmcl.setting.ConfigHolder.config; import static org.jackhuang.hmcl.setting.ConfigHolder.config;
public class Settings { public class Settings {
@@ -49,7 +53,15 @@ public class Settings {
Profiles.init(); Profiles.init();
CacheRepository.setInstance(HMCLCacheRepository.REPOSITORY); CacheRepository.setInstance(HMCLCacheRepository.REPOSITORY);
HMCLCacheRepository.REPOSITORY.directoryProperty().bind(config().commonDirectoryProperty()); HMCLCacheRepository.REPOSITORY.directoryProperty().bind(Bindings.createStringBinding(() -> {
String str = config().getCommonDirectory();
try {
Paths.get(str);
return str;
} catch (InvalidPathException e) {
return getDefaultCommonDirectory();
}
}, config().commonDirectoryProperty()));
} }
public Font getFont() { public Font getFont() {