diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-02 22:39:56 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-02 22:39:57 +0200 |
| commit | 66094dee00845dd8a7eefb0e73ed65d4b7a76d2e (patch) | |
| tree | d7db90eb69beb278b7de01e920364581ee65ba6b /src/wallet/wallet2.h | |
| parent | Merge pull request #4479 (diff) | |
| parent | wallet: fix --generate-from-json using wrong password (diff) | |
| download | monero-66094dee00845dd8a7eefb0e73ed65d4b7a76d2e.tar.xz | |
Merge pull request #4482
25e5890d wallet: fix --generate-from-json using wrong password (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.h')
| -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> |