aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2019-03-04 21:28:09 +0200
committerRiccardo Spagni <ric@spagni.net>2019-03-04 21:28:09 +0200
commit66014706bb6de6a8c868085bfd439aa844f52a3b (patch)
tree6076352fbe4863999959ffcf05ef5c57467bb8fe /src/wallet/wallet2.cpp
parentMerge pull request #5129 (diff)
parentDon't decrypt keys in view only wallets in wallet_keys_unlocker (diff)
downloadmonero-66014706bb6de6a8c868085bfd439aa844f52a3b.tar.xz
Merge pull request #5131
d2c95ab9 Don't decrypt keys in view only wallets in wallet_keys_unlocker (Doyle)
Diffstat (limited to 'src/wallet/wallet2.cpp')
-rw-r--r--src/wallet/wallet2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 6b2c27d5e..48e794616 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -892,7 +892,7 @@ wallet_keys_unlocker::wallet_keys_unlocker(wallet2 &w, const boost::optional<too
w(w),
locked(password != boost::none)
{
- if (!locked || w.is_unattended() || w.ask_password() != tools::wallet2::AskPasswordToDecrypt)
+ if (!locked || w.is_unattended() || w.ask_password() != tools::wallet2::AskPasswordToDecrypt || w.watch_only())
{
locked = false;
return;