From a2929035bc52f7bddcd70e82662b185182f35b35 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Sun, 27 Nov 2022 14:03:44 +0000
Subject: [PATCH] only update balances if not terminated

---
 core/src/main/java/bisq/core/btc/Balances.java            | 6 +-----
 .../main/java/bisq/core/btc/wallet/XmrWalletService.java  | 8 ++++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/bisq/core/btc/Balances.java b/core/src/main/java/bisq/core/btc/Balances.java
index 8b6dd093d0..6c773ffe35 100644
--- a/core/src/main/java/bisq/core/btc/Balances.java
+++ b/core/src/main/java/bisq/core/btc/Balances.java
@@ -17,7 +17,6 @@
 
 package bisq.core.btc;
 
-import bisq.common.UserThread;
 import bisq.core.btc.listeners.XmrBalanceListener;
 import bisq.core.btc.wallet.XmrWalletService;
 import bisq.core.offer.OfferPayload;
@@ -51,8 +50,6 @@ public class Balances {
     private final TradeManager tradeManager;
     private final XmrWalletService xmrWalletService;
     private final OpenOfferManager openOfferManager;
-    private final ClosedTradableManager closedTradableManager;
-    private final FailedTradesManager failedTradesManager;
     private final RefundManager refundManager;
 
     @Getter
@@ -76,8 +73,6 @@ public class Balances {
         this.tradeManager = tradeManager;
         this.xmrWalletService = xmrWalletService;
         this.openOfferManager = openOfferManager;
-        this.closedTradableManager = closedTradableManager;
-        this.failedTradesManager = failedTradesManager;
         this.refundManager = refundManager;
     }
 
@@ -95,6 +90,7 @@ public class Balances {
     }
 
     private void updatedBalances() {
+        if (!xmrWalletService.isWalletReady()) return;
         updateAvailableBalance();
         updatePendingBalance();
         updateReservedOfferBalance();
diff --git a/core/src/main/java/bisq/core/btc/wallet/XmrWalletService.java b/core/src/main/java/bisq/core/btc/wallet/XmrWalletService.java
index e31c6aeab1..974aea6f1d 100644
--- a/core/src/main/java/bisq/core/btc/wallet/XmrWalletService.java
+++ b/core/src/main/java/bisq/core/btc/wallet/XmrWalletService.java
@@ -162,12 +162,16 @@ public class XmrWalletService {
 
     public MoneroWallet getWallet() {
         State state = walletsSetup.getWalletConfig().state();
-        checkState(state == State.STARTING || state == State.RUNNING, "Cannot call until startup is complete, but state is: " + state);
+        checkState(state == State.STARTING || state == State.RUNNING, "Cannot call until startup is complete and running, but state is: " + state);
         return wallet;
     }
 
     public boolean isWalletReady() {
-        return getWallet() != null;
+        try {
+            return getWallet() != null;
+        } catch (Exception e) {
+            return false;
+        }
     }
 
     public boolean isWalletEncrypted() {