From 4308b5319e9082caac0c708050173e75f8aa1dd2 Mon Sep 17 00:00:00 2001 From: James Coxon Date: Sat, 15 Apr 2017 22:49:37 +0100 Subject: [PATCH] Added if clause to check if new password is empty linked to #87 --- rai/qt/qt.cpp | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/rai/qt/qt.cpp b/rai/qt/qt.cpp index d815a0a9..2fdddbcb 100644 --- a/rai/qt/qt.cpp +++ b/rai/qt/qt.cpp @@ -1087,17 +1087,27 @@ 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 () == retype_password->text ()) + if (new_password->text ().isEmpty()) { - this->wallet.wallet_m->store.rekey (transaction, std::string (new_password->text ().toLocal8Bit ())); new_password->clear (); - retype_password->clear (); - retype_password->setPlaceholderText ("Retype password"); + new_password->setPlaceholderText ("Empty Password - try again: New password"); + retype_password->clear (); + retype_password->setPlaceholderText ("Empty Password - try again: Retype password"); } else { - retype_password->clear (); - retype_password->setPlaceholderText ("Password mismatch"); + if (new_password->text () == retype_password->text ()) + { + this->wallet.wallet_m->store.rekey (transaction, std::string (new_password->text ().toLocal8Bit ())); + new_password->clear (); + retype_password->clear (); + retype_password->setPlaceholderText ("Retype password"); + } + else + { + retype_password->clear (); + retype_password->setPlaceholderText ("Password mismatch"); + } } } });