From 1809e34aaa8f017dd9363d4c1aa6ad9e40583b58 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Wed, 1 Mar 2023 13:14:53 -0500
Subject: [PATCH] only import multisig hex on dispute closed if wallet exists
 after sync

---
 .../dispute/arbitration/ArbitrationManager.java        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java b/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
index 60d1c6f6..39c540ba 100644
--- a/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
+++ b/core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java
@@ -251,15 +251,17 @@ public final class ArbitrationManager extends DisputeManager<ArbitrationDisputeL
                 }
                 dispute.setDisputeResult(disputeResult);
 
-                // import multisig hex
-                if (disputeClosedMessage.getUpdatedMultisigHex() != null) trade.getArbitrator().setUpdatedMultisigHex(disputeClosedMessage.getUpdatedMultisigHex());
-                trade.importMultisigHex();
-
                 // sync and save wallet
                 if (!trade.isPayoutPublished()) {
                     trade.syncWallet();
                     trade.saveWallet();
                 }
+
+                // import multisig hex
+                if (trade.walletExists()) {
+                    if (disputeClosedMessage.getUpdatedMultisigHex() != null) trade.getArbitrator().setUpdatedMultisigHex(disputeClosedMessage.getUpdatedMultisigHex());
+                    trade.importMultisigHex();
+                }
         
                 // attempt to sign and publish dispute payout tx if given and not already published
                 if (disputeClosedMessage.getUnsignedPayoutTxHex() != null && !trade.isPayoutPublished()) {