Merge pull request #4916 from chimp1984/fix-access-from-wrong-thread-…

…at-wallet-restore Property fields must not be set from non JavaFX threads.
bisq-network · Dec 14, 2020 · 0e7dd21 · 0e7dd21
2 parents 7d12b94 + cd98617
commit 0e7dd21
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java b/core/src/main/java/bisq/core/btc/setup/WalletsSetup.java
@@ -242,14 +242,16 @@ protected void onSetupCompleted() {
                     return message;
                 });
 
-                chainHeight.set(chain.getBestChainHeight());
                 chain.addNewBestBlockListener(block -> {
-                    connectedPeers.set(peerGroup.getConnectedPeers());
-                    chainHeight.set(block.getHeight());
+                    UserThread.execute(() -> {
+                        connectedPeers.set(peerGroup.getConnectedPeers());
+                        chainHeight.set(block.getHeight());
+                    });
                 });
 
                 // Map to user thread
                 UserThread.execute(() -> {
+                    chainHeight.set(chain.getBestChainHeight());
                     addressEntryList.onWalletReady(walletConfig.btcWallet());
                     timeoutTimer.stop();
                     setupCompletedHandlers.forEach(Runnable::run);