fix unlatching trade twice on payment received failure

woodser · woodser · commit f5feaafdf8c2 · 2025-09-10T01:04:10.000-04:00
diff --git a/core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java b/core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java
@@ -685,6 +685,7 @@ private void handle(PaymentReceivedMessage message, NodeAddress peer, boolean re
                                                 maybeReprocessPaymentReceivedMessage(reprocessOnError);
                                             }, trade.getReprocessDelayInSeconds(reprocessPaymentReceivedMessageCount));
                                         }
+                                        unlatchTrade();
                                     } else {
 
                                         // export fresh multisig info for nack
@@ -694,7 +695,6 @@ private void handle(PaymentReceivedMessage message, NodeAddress peer, boolean re
                                         trade.onPayoutError(false, false);
                                         handleTaskRunnerFault(peer, message, null, errorMessage, trade.getSelf().getUpdatedMultisigHex()); // send nack
                                     }
-                                    unlatchTrade();
                                 })))
                         .executeTasks(true);
                     awaitTradeLatch();

Original file line number	Diff line number	Diff line change
`@@ -685,6 +685,7 @@ private void handle(PaymentReceivedMessage message, NodeAddress peer, boolean re`
`685`	`685`	`maybeReprocessPaymentReceivedMessage(reprocessOnError);`
`686`	`686`	`}, trade.getReprocessDelayInSeconds(reprocessPaymentReceivedMessageCount));`
`687`	`687`	`}`
	`688`	`+ unlatchTrade();`
`688`	`689`	`} else {`
`689`	`690`
`690`	`691`	`// export fresh multisig info for nack`
`@@ -694,7 +695,6 @@ private void handle(PaymentReceivedMessage message, NodeAddress peer, boolean re`
`694`	`695`	`trade.onPayoutError(false, false);`
`695`	`696`	`handleTaskRunnerFault(peer, message, null, errorMessage, trade.getSelf().getUpdatedMultisigHex()); // send nack`
`696`	`697`	`}`
`697`		`- unlatchTrade();`
`698`	`698`	`})))`
`699`	`699`	`.executeTasks(true);`
`700`	`700`	`awaitTradeLatch();`