diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-10-01 11:18:50 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-10-01 12:32:26 +0000 |
| commit | 25e5890d37a1b243d4b8aadb45743d715bd4d0f9 (patch) | |
| tree | 2cb9f5543d11a7f7e18145cb0dcf15f209c38c73 /src/wallet/wallet2.h | |
| parent | Merge pull request #4333 (diff) | |
| download | monero-25e5890d37a1b243d4b8aadb45743d715bd4d0f9.tar.xz | |
wallet: fix --generate-from-json using wrong password
Diffstat (limited to '')
| -rw-r--r-- | src/wallet/wallet2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 497dd486f..7857f36f1 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -177,7 +177,7 @@ namespace tools static void init_options(boost::program_options::options_description& desc_params); //! Uses stdin and stdout. Returns a wallet2 if no errors. - static std::unique_ptr<wallet2> make_from_json(const boost::program_options::variables_map& vm, bool unattended, const std::string& json_file, const std::function<boost::optional<password_container>(const char *, bool)> &password_prompter); + static std::pair<std::unique_ptr<wallet2>, password_container> make_from_json(const boost::program_options::variables_map& vm, bool unattended, const std::string& json_file, const std::function<boost::optional<password_container>(const char *, bool)> &password_prompter); //! Uses stdin and stdout. Returns a wallet2 and password for `wallet_file` if no errors. static std::pair<std::unique_ptr<wallet2>, password_container> |