From ea426f1109703491552c7f9d0344e03a66288d87 Mon Sep 17 00:00:00 2001 From: woodser <13068859+woodser@users.noreply.github.com> Date: Fri, 26 Sep 2025 07:07:42 -0400 Subject: [PATCH] skip trade shutdown log when finalized in previous release --- core/src/main/java/haveno/core/trade/Trade.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java index f7a5c7d8af..aa732878ff 100644 --- a/core/src/main/java/haveno/core/trade/Trade.java +++ b/core/src/main/java/haveno/core/trade/Trade.java @@ -907,6 +907,10 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model { } } + private boolean walletExistsNoSync() { + return xmrWalletService.walletExists(getWalletName()); + } + public MoneroWallet createWallet() { synchronized (walletLock) { if (walletExists()) throw new RuntimeException("Cannot create trade wallet because it already exists"); @@ -1751,7 +1755,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model { public void shutDown() { if (isShutDown) return; // ignore if already shut down onShutDownStarted(); - if (!isPayoutFinalized()) log.info("Shutting down {} {}", getClass().getSimpleName(), getId()); + if (!isPayoutFinalized() || !(isPayoutUnlocked() && !walletExistsNoSync())) log.info("Shutting down {} {}", getClass().getSimpleName(), getId()); // unregister p2p message listener removeDecryptedDirectMessageListener();