From 85fc0ca2cdf83b015e2d7b603c03ed5b061fc0fb Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 8 Apr 2016 20:38:57 +0200 Subject: [PATCH] Fix bug with missing check for pending tx --- .../protocol/trade/tasks/shared/BroadcastAfterLockTime.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/BroadcastAfterLockTime.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/BroadcastAfterLockTime.java index 8ea1217f7c..4e74d87d1b 100644 --- a/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/BroadcastAfterLockTime.java +++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/shared/BroadcastAfterLockTime.java @@ -78,10 +78,10 @@ public class BroadcastAfterLockTime extends TradeTask { log.debug("payoutTxFromWallet:" + payoutTxFromWallet); if (payoutTxFromWallet != null) payoutTx = payoutTxFromWallet; - + TransactionConfidence.ConfidenceType confidenceType = payoutTx.getConfidence().getConfidenceType(); log.debug("payoutTx confidenceType:" + confidenceType); - if (confidenceType.equals(TransactionConfidence.ConfidenceType.BUILDING)) { + if (confidenceType.equals(TransactionConfidence.ConfidenceType.BUILDING) || confidenceType.equals(TransactionConfidence.ConfidenceType.PENDING)) { log.debug("payoutTx already building:" + payoutTx); trade.setState(Trade.State.PAYOUT_BROAD_CASTED); complete();