Fixing crash on non-HD wallet. (#1001)

* Fixing crash on non-HD wallet * Not show recovery screen when -usehd=0 is set
firoorg · Feb 15, 2021 · 5c372f2 · 5c372f2
1 parent a2d8ba8
commit 5c372f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -763,8 +763,8 @@ int main(int argc, char *argv[])
     // - Using mnemonic (-usemnemonic on (default)) and
     // - mnemonic not set (default, not setting mnemonic from conf file instead) and
     // - hdseed not set (default, not setting hd seed from conf file instead)
-
-    if(GetBoolArg("-usemnemonic", DEFAULT_USE_MNEMONIC) &&
+    if(GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) &&
+       GetBoolArg("-usemnemonic", DEFAULT_USE_MNEMONIC) &&
        !GetBoolArg("-disablewallet", false) &&
        GetArg("-mnemonic", "").empty() &&
        GetArg("-hdseed", "not hex")=="not hex"){

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2981,7 +2981,7 @@ std::vector<unsigned char> CWallet::EncryptMintAmount(uint64_t amount, const sec
 }
 
 bool CWallet::DecryptMintAmount(const std::vector<unsigned char>& encryptedValue, const secp_primitives::GroupElement& pubcoin, uint64_t& amount) const {
-    if(IsLocked()) {
+    if (IsLocked() || hdChain.masterKeyID.IsNull()) {
         amount = 0;
         return true;
     }