aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.h
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2019-12-12 13:49:58 -0600
committerluigi1111 <luigi1111w@gmail.com>2019-12-12 13:49:58 -0600
commitb4e1dc83d275f8ee9a8c12615cf952f05161c7a3 (patch)
tree876562b1c2da9b7d3343a8f6e22f3a2dd184300f /src/wallet/wallet2.h
parentMerge pull request #6056 (diff)
parentwallet2: make keys unlocker reentrant (diff)
downloadmonero-b4e1dc83d275f8ee9a8c12615cf952f05161c7a3.tar.xz
Merge pull request #6057
3b8dcc2 wallet2: make keys unlocker reentrant (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.h')
-rw-r--r--src/wallet/wallet2.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index c86315f7c..b6f72c7e1 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -122,6 +122,8 @@ private:
wallet2 &w;
bool locked;
crypto::chacha_key key;
+ static boost::mutex lockers_lock;
+ static unsigned int lockers;
};
class i_wallet2_callback