diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2013-10-01 16:18:50 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-10-01 16:18:50 -0400 |
| commit | 19e5ae7369de8ff556b2ea008850a62b1fde9a1b (patch) | |
| tree | 4b712da1581c88940fd7fcf1a4dc184419eec792 /src/rpcrawtransaction.cpp | |
| parent | b63ae2a5349ecc62a52c4e7bce1421652110e988 (diff) | |
| parent | b0730874d95e42953736f49d8041221d698ed95a (diff) | |
| download | bitcoin-19e5ae7369de8ff556b2ea008850a62b1fde9a1b.tar.xz | |
Merge branch 'pwalletmain' - checking pwalletMain for NULL,
a pre-req for no-wallet support.
Diffstat (limited to 'src/rpcrawtransaction.cpp')
| -rw-r--r-- | src/rpcrawtransaction.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index ce9d60e667..fcc5359dd6 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -171,6 +171,7 @@ Value listunspent(const Array& params, bool fHelp) Array results; vector<COutput> vecOutputs; + assert(pwalletMain != NULL); pwalletMain->AvailableCoins(vecOutputs, false); BOOST_FOREACH(const COutput& out, vecOutputs) { @@ -458,7 +459,7 @@ Value signrawtransaction(const Array& params, bool fHelp) } } - const CKeyStore& keystore = (fGivenKeys ? tempKeystore : *pwalletMain); + const CKeyStore& keystore = ((fGivenKeys || !pwalletMain) ? tempKeystore : *pwalletMain); int nHashType = SIGHASH_ALL; if (params.size() > 3 && params[3].type() != null_type) |