Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-11-30 00:16:42 -05:00
Code Issues Projects Releases Packages Wiki Activity

do not set dispute result on cancel

Browse source
This commit is contained in:
woodser 2025-09-28 03:54:44 -04:00 • committed by woodser
parent f0f451c13d
commit eca5ec6e8f
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
desktop/src/main/java/haveno/desktop/main/overlays/windows/DisputeSummaryWindow.java
View file

@ -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();
});
}