diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-03-06 15:14:59 +0000 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-03-06 15:14:59 +0000 |
commit | 5bcb25f3f8aa2833b07b56668846c7cf86e2760e (patch) | |
tree | c2eac01d1173f913004c26dd91fed715e6a555dd /src/wallet | |
parent | Merge pull request #1845 (diff) | |
parent | wallet: add password command (diff) | |
download | monero-5bcb25f3f8aa2833b07b56668846c7cf86e2760e.tar.xz |
Merge pull request #1846
4b48565c wallet: add password command (moneromooo-monero)
Diffstat (limited to 'src/wallet')
-rw-r--r-- | src/wallet/wallet2.cpp | 4 | ||||
-rw-r--r-- | src/wallet/wallet2.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index bc182e04b..7ae2ce074 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -452,10 +452,10 @@ void wallet2::init_options(boost::program_options::options_description& desc_par command_line::add_arg(desc_params, opts.restricted); } -boost::optional<password_container> wallet2::password_prompt(const bool is_new_wallet) +boost::optional<password_container> wallet2::password_prompt(const bool new_password) { auto pwd_container = tools::password_container::prompt( - is_new_wallet, (is_new_wallet ? tr("Enter a password for your new wallet") : tr("Wallet password")) + new_password, (new_password ? tr("Enter new wallet password") : tr("Wallet password")) ); if (!pwd_container) { diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index a074bfc37..ddc237f1b 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -114,7 +114,7 @@ namespace tools static void init_options(boost::program_options::options_description& desc_params); //! \return Password retrieved from prompt. Logs error on failure. - static boost::optional<password_container> password_prompt(const bool is_new_wallet); + static boost::optional<password_container> password_prompt(const bool new_password); //! 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, const std::string& json_file); |