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

Fix NPE when app stopped

Browse Source
This commit is contained in:
huanghongxun
2018-10-23 13:36:45 +08:00
parent ee1c0d362d
commit 5d232c3f5e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java
View File

@@ -99,9 +99,10 @@ public final class Controllers {
// FXThread // FXThread
public static AccountList getAccountListPage() { public static AccountList getAccountListPage() {
if (accountListPage == null) { if (accountListPage == null) {
accountListPage = new AccountList(); AccountList accountListPage = new AccountList();
accountListPage.selectedAccountProperty().bindBidirectional(Accounts.selectedAccountProperty()); accountListPage.selectedAccountProperty().bindBidirectional(Accounts.selectedAccountProperty());
accountListPage.accountsProperty().bindContent(Accounts.accountsProperty()); accountListPage.accountsProperty().bindContent(Accounts.accountsProperty());
Controllers.accountListPage = accountListPage;
} }
return accountListPage; return accountListPage;
} }
@@ -109,9 +110,10 @@ public final class Controllers {
// FXThread // FXThread
public static ProfileList getProfileListPage() { public static ProfileList getProfileListPage() {
if (profileListPage == null) { if (profileListPage == null) {
profileListPage = new ProfileList(); ProfileList profileListPage = new ProfileList();
profileListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty()); profileListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty());
profileListPage.profilesProperty().bindContent(Profiles.profilesProperty()); profileListPage.profilesProperty().bindContent(Profiles.profilesProperty());
Controllers.profileListPage = profileListPage;
} }
return profileListPage; return profileListPage;
} }
@@ -137,7 +139,7 @@ public final class Controllers {
public static MainPage getMainPage() { public static MainPage getMainPage() {
if (mainPage == null) { if (mainPage == null) {
mainPage = new MainPage(); MainPage mainPage = new MainPage();
mainPage.setOnDragOver(event -> { mainPage.setOnDragOver(event -> {
if (event.getGestureSource() != mainPage && event.getDragboard().hasFiles()) { if (event.getGestureSource() != mainPage && event.getDragboard().hasFiles()) {
if (event.getDragboard().getFiles().stream().anyMatch(it -> "zip".equals(FileUtils.getExtension(it)))) if (event.getDragboard().getFiles().stream().anyMatch(it -> "zip".equals(FileUtils.getExtension(it))))
@@ -190,6 +192,7 @@ public final class Controllers {
mainPage.getVersions().setAll(children); mainPage.getVersions().setAll(children);
}); });
}); });
Controllers.mainPage = mainPage;
} }
return mainPage; return mainPage;
} }