4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-01-28 18:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix#864 fix using boolean

Browse Source
This commit is contained in:
guzzi_jones 2016-07-31 23:36:24 +00:00
commit c7920e1cf8
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/simplewallet/password_container.cpp
View File

@ -60,6 +60,14 @@ namespace tools
} }
password_container::password_container(std::string&& password)
: m_empty(false)
, m_password(std::move(password))
, m_verify(false)
{
}
password_container::password_container(password_container&& rhs) password_container::password_container(password_container&& rhs)
: m_empty(std::move(rhs.m_empty)) : m_empty(std::move(rhs.m_empty))

1
src/simplewallet/password_container.h
View File

@ -41,6 +41,7 @@ namespace tools
static const size_t max_password_size = 1024; static const size_t max_password_size = 1024;
password_container(bool verify); password_container(bool verify);
password_container(password_container&& rhs); password_container(password_container&& rhs);
password_container(std::string&& password);
~password_container(); ~password_container();
void clear(); void clear();

2
src/simplewallet/simplewallet.cpp
View File

@ -468,6 +468,7 @@ bool simple_wallet::set_default_mixin(const std::vector<std::string> &args/* = s
verify=true; verify=true;
tools::password_container pwd_container(verify); tools::password_container pwd_container(verify);
success = pwd_container.read_password(); success = pwd_container.read_password();
if (!success) if (!success)
{ {
@ -1564,6 +1565,7 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string
return false; return false;
} }
m_wallet_file=wallet_file; m_wallet_file=wallet_file;
m_wallet.reset(new tools::wallet2(testnet)); m_wallet.reset(new tools::wallet2(testnet));