From eca5ec6e8fbfd2ab26840f5ffc94d4d6e438bb98 Mon Sep 17 00:00:00 2001
From: woodser <13068859+woodser@users.noreply.github.com>
Date: Sun, 28 Sep 2025 03:54:44 -0400
Subject: [PATCH] do not set dispute result on cancel

---
 .../desktop/main/overlays/windows/DisputeSummaryWindow.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/desktop/src/main/java/haveno/desktop/main/overlays/windows/DisputeSummaryWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/DisputeSummaryWindow.java
index 4a48f0336f..52397a8125 100644
--- a/desktop/src/main/java/haveno/desktop/main/overlays/windows/DisputeSummaryWindow.java
+++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/DisputeSummaryWindow.java
@@ -209,7 +209,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
         addPayoutAmountTextFields();
         addReasonControls();
 
-        boolean applyPeersDisputeResult = peersDisputeOptional.isPresent() && peersDisputeOptional.get().isClosed();
+        boolean applyPeersDisputeResult = peersDisputeOptional.isPresent() && peersDisputeOptional.get().isClosed() && peersDisputeOptional.get().getDisputeResultProperty().get() != null;
         if (applyPeersDisputeResult) {
             // If the other peers dispute has been closed we apply the result to ourselves
             DisputeResult peersDisputeResult = peersDisputeOptional.get().getDisputeResultProperty().get();
@@ -223,7 +223,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
             disableTradeAmountPayoutControls();
             applyTradeAmountRadioButtonStates();
         } else if (trade.isPayoutPublished()) {
-            log.warn("Payout is already published for {} {}, disabling payout controls", trade.getClass().getSimpleName(), trade.getId());
+            log.info("Payout is already published for {} {}, disabling payout controls", trade.getClass().getSimpleName(), trade.getId());
             disableTradeAmountPayoutControls();
         } else if (trade.isDepositTxMissing()) {
             log.warn("Missing deposit tx for {} {}, disabling some payout controls", trade.getClass().getSimpleName(), trade.getId());
@@ -625,8 +625,6 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
         });
 
         cancelButton.setOnAction(e -> {
-            dispute.setDisputeResult(disputeResult);
-            checkNotNull(getDisputeManager(dispute)).requestPersistence();
             hide();
         });
     }