Merge pull request #5797 from jmacxx/fix_exception_opening_mediation

Prevent NPE in case delayedPayoutTx is not present (failed trade)
bisq-network · Nov 4, 2021 · 851bdcf · 851bdcf
2 parents 928208c + c916e9b
commit 851bdcf
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
@@ -495,7 +495,8 @@ private void doOpenDispute(boolean isSupportTicket, Transaction depositTx) {
         }
         Trade.DisputeState disputeState = trade.getDisputeState();
         DisputeManager<? extends DisputeList<Dispute>> disputeManager;
-        long remainingLockTime = trade.getDelayedPayoutTx().getLockTime() - btcWalletService.getBestChainHeight();
+        long lockTime = trade.getDelayedPayoutTx() == null ? trade.getLockTime() : trade.getDelayedPayoutTx().getLockTime();
+        long remainingLockTime = lockTime - btcWalletService.getBestChainHeight();
         // In case we re-open a dispute we allow Trade.DisputeState.MEDIATION_REQUESTED
         boolean useMediation = disputeState == Trade.DisputeState.NO_DISPUTE ||
                 (disputeState == Trade.DisputeState.MEDIATION_REQUESTED && remainingLockTime > 0);