Merge branch 'empty_password'

This commit is contained in:
James Coxon 2017-04-15 23:05:13 +01:00
commit a77dc13940

View file

@ -1100,6 +1100,15 @@ wallet (wallet_a)
{
rai::transaction transaction (this->wallet.wallet_m->store.environment, nullptr, true);
if (this->wallet.wallet_m->store.valid_password (transaction))
{
if (new_password->text ().isEmpty())
{
new_password->clear ();
new_password->setPlaceholderText ("Empty Password - try again: New password");
retype_password->clear ();
retype_password->setPlaceholderText ("Empty Password - try again: Retype password");
}
else
{
if (new_password->text () == retype_password->text ())
{
@ -1114,6 +1123,7 @@ wallet (wallet_a)
retype_password->setPlaceholderText ("Password mismatch");
}
}
}
});
QObject::connect (change_rep, &QPushButton::released, [this] ()
{