diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-13 12:28:11 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-13 12:28:19 +0100 |
| commit | ea062655e045b68d568d2faf7abe946deb00d46d (patch) | |
| tree | 71ad95a6cd2a3f0c96f93164f43cf3879da7af99 | |
| parent | 19e5b9d2dfcac4efadba636745485d9660fb1abe (diff) | |
| parent | fdbc2b142d541f841e94119de909c8268dad61ac (diff) | |
| download | bitcoin-ea062655e045b68d568d2faf7abe946deb00d46d.tar.xz | |
Merge pull request #3657
fdbc2b1 If requested, actually treat uncomfirmed change as being uncomfirmed (b6393ce9-d324-4fe1-996b-acf82dbc3d53)
| -rw-r--r-- | src/wallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.h b/src/wallet.h index 1bf9bb185c..e5104f1362 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -702,7 +702,7 @@ public: return false; if (GetDepthInMainChain() >= 1) return true; - if (!IsFromMe()) // using wtx's cached debit + if (!bSpendZeroConfChange || !IsFromMe()) // using wtx's cached debit return false; // If no confirmations but it's from us, we can still |