diff options
| author | warptangent <warptangent@inbox.com> | 2014-12-10 02:51:45 -0800 |
|---|---|---|
| committer | warptangent <warptangent@inbox.com> | 2014-12-10 02:56:54 -0800 |
| commit | d7aafd555a032b02ea8c593a4cba0e0f24d23c0c (patch) | |
| tree | cf7cd1e19de789e2c961c286bbffa5709d4859b5 /src | |
| parent | version bump to 0.8.8.6 (diff) | |
| download | monero-d7aafd555a032b02ea8c593a4cba0e0f24d23c0c.tar.xz | |
wallet2::rewrite update to not require bin file
Allow pre-JSON wallet format to load without depending on existing bin
file.
Don't write bin file while inside keys rewrite, so bin file write
behavior here matches that of regular wallet load.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 163e19df4..13bfa7bcb 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -616,11 +616,9 @@ void wallet2::rewrite(const std::string& wallet_name, const std::string& passwor { prepare_file_names(wallet_name); boost::system::error_code ignored_ec; - THROW_WALLET_EXCEPTION_IF(!boost::filesystem::exists(m_wallet_file, ignored_ec), error::file_not_found, m_wallet_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); THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, m_keys_file); - store(); } //---------------------------------------------------------------------------------------------------- void wallet2::wallet_exists(const std::string& file_path, bool& keys_file_exists, bool& wallet_file_exists) |