MN: Fix issue bitcoin#24 with collateral output lock

BTA-BATA · May 1, 2019 · 3393d47 · 3393d47
1 parent 65101fb
commit 3393d47
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2765,7 +2765,8 @@ void CWallet::AvailableCoins(std::vector<COutput> &vCoins, bool fOnlySafe, const
             if (coinControl && coinControl->HasSelected() && !coinControl->fAllowOtherInputs && !coinControl->IsSelected(COutPoint(entry.first, i)))
                 continue;
 
-            if (IsLockedCoin(entry.first, i))
+            // VELES edit: fix inconvenience and allow locked collateral
+            if (IsLockedCoin(entry.first, i) && nCoinType != ONLY_MASTERNODE_COLLATERAL)
                 continue;
 
             if (IsSpent(wtxid, i))