Merge pull request #1504

5f4ac6b9 wallet2 bugfix: store watch_only flag properly with rewrite() (kenshi84)
This commit is contained in:
Riccardo Spagni 2017-01-08 16:38:19 -08:00
commit 0ce4618bea
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -2138,7 +2138,7 @@ void wallet2::rewrite(const std::string& wallet_name, const std::string& passwor
prepare_file_names(wallet_name); prepare_file_names(wallet_name);
boost::system::error_code ignored_ec; boost::system::error_code ignored_ec;
THROW_WALLET_EXCEPTION_IF(!boost::filesystem::exists(m_keys_file, ignored_ec), error::file_not_found, m_keys_file); THROW_WALLET_EXCEPTION_IF(!boost::filesystem::exists(m_keys_file, ignored_ec), error::file_not_found, m_keys_file);
bool r = store_keys(m_keys_file, password, false); bool r = store_keys(m_keys_file, password, m_watch_only);
THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, m_keys_file); THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, m_keys_file);
} }
/*! /*!