Merge pull request #3312

399120dd simplewallet: set seed language when restoring from english-old seed (stoffu)
This commit is contained in:
Riccardo Spagni 2018-03-05 19:16:52 +02:00
commit 0c2b25204e
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -2839,7 +2839,7 @@ bool simple_wallet::new_wallet(const boost::program_options::variables_map& vm,
// a seed language is not already specified AND // a seed language is not already specified AND
// (it is not a wallet restore OR if it was a deprecated wallet // (it is not a wallet restore OR if it was a deprecated wallet
// that was earlier used before this restore) // that was earlier used before this restore)
if ((!two_random) && (mnemonic_language.empty()) && (!m_restore_deterministic_wallet || was_deprecated_wallet)) if ((!two_random) && (mnemonic_language.empty() || mnemonic_language == crypto::ElectrumWords::old_language_name) && (!m_restore_deterministic_wallet || was_deprecated_wallet))
{ {
if (was_deprecated_wallet) if (was_deprecated_wallet)
{ {