diff options
| author | Jeff Garzik <[email protected]> | 2011-07-13 18:22:19 -0700 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2011-07-13 18:22:19 -0700 |
| commit | 60d2f8662c48d3456e41b8e2b118c20e2ea43ace (patch) | |
| tree | e5f66dbc4fa2f57fbd468cf5aca50fd4b32aafd3 /src/wallet.cpp | |
| parent | Merge pull request #406 from muggenhor/warning-fixes (diff) | |
| parent | Fix crashes when a wallet is locked and GetReservedKey() is called (diff) | |
| download | discoin-60d2f8662c48d3456e41b8e2b118c20e2ea43ace.tar.xz discoin-60d2f8662c48d3456e41b8e2b118c20e2ea43ace.zip | |
Merge pull request #409 from TheBlueMatt/master
Fix crashes when a wallet is locked and GetReservedKey() is called
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index f27585352..5f7cddf57 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1320,7 +1320,10 @@ vector<unsigned char> CReserveKey::GetReservedKey() { CKeyPool keypool; pwallet->ReserveKeyFromKeyPool(nIndex, keypool); - vchPubKey = keypool.vchPubKey; + if (nIndex != -1) + vchPubKey = keypool.vchPubKey; + else + vchPubKey = vchDefaultKey; } assert(!vchPubKey.empty()); return vchPubKey; |