diff options
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index 7182c14146..7263565047 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -373,9 +373,6 @@ bool AppInit2(boost::thread_group& threadGroup) // ********************************************************* Step 2: parameter interactions Checkpoints::fEnabled = GetBoolArg("-checkpoints", true); - if (!SelectParamsFromCommandLine()) { - return InitError("Invalid combination of -testnet and -regtest."); - } if (mapArgs.count("-bind")) { // when specifying an explicit binding address, you want to listen on it @@ -898,7 +895,7 @@ bool AppInit2(boost::thread_group& threadGroup) CPubKey newDefaultKey; if (pwalletMain->GetKeyFromPool(newDefaultKey, false)) { pwalletMain->SetDefaultKey(newDefaultKey); - if (!pwalletMain->SetAddressBookName(pwalletMain->vchDefaultKey.GetID(), "")) + if (!pwalletMain->SetAddressBook(pwalletMain->vchDefaultKey.GetID(), "", "receive")) strErrors << _("Cannot write default address") << "\n"; } |