Merge pull request #908 from orogvany/check_wallet_lock

GUI: check if wallet unlocked before updating send
semuxproject · May 25, 2018 · 73852f9 · 73852f9
2 parents efd2e9d + b0dc5c6
commit 73852f9
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/main/java/org/semux/gui/panel/SendPanel.java b/src/main/java/org/semux/gui/panel/SendPanel.java
@@ -336,17 +336,18 @@ protected void refresh() {
             }
         }
 
-        // add aliases to list of accounts
-        for (Map.Entry<ByteArray, String> address : kernel.getWallet().getAddressAliases().entrySet()) {
-            // only add aliases not in wallet
-            if (kernel.getWallet().getAccount(address.getKey().getData()) == null) {
-                accountItems.add(new AccountItem(address.getValue(), address.getKey().getData()));
+        // 'to' contains all current accounts and address book, only update if user
+        // isn't interacting with it, and wallet is unlocked
+        if (!selectTo.isPopupVisible() && kernel.getWallet().isUnlocked()) {
+
+            // add aliases to list of accounts
+            for (Map.Entry<ByteArray, String> address : kernel.getWallet().getAddressAliases().entrySet()) {
+                // only add aliases not in wallet
+                if (kernel.getWallet().getAccount(address.getKey().getData()) == null) {
+                    accountItems.add(new AccountItem(address.getValue(), address.getKey().getData()));
+                }
             }
-        }
 
-        // 'to' contains all current accounts and address book, only update if user
-        // isn't interacting with it
-        if (!selectTo.isPopupVisible()) {
             Object toSelected = selectTo.getSelectedItem();
 
             selectTo.removeAllItems();