From 2d985af60d3d2eaafa8c7c1797e6bbb7eb9a0858 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Mon, 9 Jul 2018 21:34:22 +0800
Subject: [PATCH] Fix selected account is not loaded

---
 HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java
index 2e87dfd2c..43e8411f8 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java
@@ -84,6 +84,8 @@ public class Settings {
 
         ConfigHolder.CONFIG.authlibInjectorServers.addListener(onInvalidating(this::removeDanglingAuthlibInjectorAccounts));
 
+        this.selectedAccount.set(accounts.get(ConfigHolder.CONFIG.selectedAccount.get()));
+
         checkProfileMap();
 
         save();
@@ -300,7 +302,7 @@ public class Settings {
      *               ACCOUNTS               *
      ****************************************/
 
-    private final ImmediateObjectProperty<Account> selectedAccount = new ImmediateObjectProperty<Account>(this, "selectedAccount", accounts.get(ConfigHolder.CONFIG.selectedAccount.get())) {
+    private final ImmediateObjectProperty<Account> selectedAccount = new ImmediateObjectProperty<Account>(this, "selectedAccount", null) {
         @Override
         public Account get() {
             Account a = super.get();