diff options
| author | Gregory Maxwell <greg@xiph.org> | 2013-08-23 12:54:50 -0700 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2013-08-23 12:54:50 -0700 |
| commit | 71ac5052d83fcba21a09e5e2b7ad66faea6bd42a (patch) | |
| tree | 45c6cf793ee33237699ed83d8cd12d8fdefb4a6f /src/qt | |
| parent | 20469d83dd2fd7d8efacf94f017b926be7c92e63 (diff) | |
| download | bitcoin-71ac5052d83fcba21a09e5e2b7ad66faea6bd42a.tar.xz | |
Remove fAllowReuse from GetKeyFromPool.
With the GUI password fix this was always false.
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/addresstablemodel.cpp | 4 | ||||
| -rw-r--r-- | src/qt/paymentserver.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index d4a7a92876..03517c657f 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -356,7 +356,7 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con { // Generate a new address to associate with given label CPubKey newKey; - if(!wallet->GetKeyFromPool(newKey, false)) + if(!wallet->GetKeyFromPool(newKey)) { WalletModel::UnlockContext ctx(walletModel->requestUnlock()); if(!ctx.isValid()) @@ -365,7 +365,7 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con editStatus = WALLET_UNLOCK_FAILURE; return QString(); } - if(!wallet->GetKeyFromPool(newKey, false)) + if(!wallet->GetKeyFromPool(newKey)) { editStatus = KEY_GENERATION_FAILURE; return QString(); diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index a9f71315a9..ff3c2a0981 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -531,7 +531,7 @@ PaymentServer::fetchPaymentACK(CWallet* wallet, SendCoinsRecipient recipient, QB } else { CPubKey newKey; - if (wallet->GetKeyFromPool(newKey, false)) { + if (wallet->GetKeyFromPool(newKey)) { CKeyID keyID = newKey.GetID(); wallet->SetAddressBook(keyID, strAccount, "refund"); |