Merge pull request #4791

5878fe95 simplewallet: don't skip asking for password when watch-only (stoffu)
This commit is contained in:
Riccardo Spagni 2018-11-16 11:08:34 +02:00
commit 86395e5bd6
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -105,7 +105,7 @@ typedef cryptonote::simple_wallet sw;
#define SCOPED_WALLET_UNLOCK() \ #define SCOPED_WALLET_UNLOCK() \
LOCK_IDLE_SCOPE(); \ LOCK_IDLE_SCOPE(); \
boost::optional<tools::password_container> pwd_container = boost::none; \ boost::optional<tools::password_container> pwd_container = boost::none; \
if (m_wallet->ask_password() && !m_wallet->watch_only() && !(pwd_container = get_and_verify_password())) { return true; } \ if (m_wallet->ask_password() && !(pwd_container = get_and_verify_password())) { return true; } \
tools::wallet_keys_unlocker unlocker(*m_wallet, pwd_container); tools::wallet_keys_unlocker unlocker(*m_wallet, pwd_container);
enum TransferType { enum TransferType {