diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-05-01 15:32:52 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-05-01 15:32:52 -0500 |
| commit | c9b800a787cf2eba8803ddd03020e36d21c278b7 (patch) | |
| tree | 1cedd9357896d95899a554f5ab3259d96275df92 /src/wallet/wallet2.cpp | |
| parent | f020b24b020e3becd905ef9d0e47a8208c4baffe (diff) | |
| parent | e509ede2aa7263cc49d3378bc8c833a62300211d (diff) | |
| download | monzero-core-c9b800a787cf2eba8803ddd03020e36d21c278b7.tar.gz monzero-core-c9b800a787cf2eba8803ddd03020e36d21c278b7.tar.xz monzero-core-c9b800a787cf2eba8803ddd03020e36d21c278b7.zip | |
Merge pull request #6446
e509ede trezor: adapt to new passphrase mechanism (ph4r05)
Diffstat (limited to 'src/wallet/wallet2.cpp')
| -rw-r--r-- | src/wallet/wallet2.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 4220f18be..476248d18 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -1109,10 +1109,12 @@ boost::optional<epee::wipeable_string> wallet_device_callback::on_pin_request() return boost::none; } -boost::optional<epee::wipeable_string> wallet_device_callback::on_passphrase_request(bool on_device) +boost::optional<epee::wipeable_string> wallet_device_callback::on_passphrase_request(bool & on_device) { if (wallet) return wallet->on_device_passphrase_request(on_device); + else + on_device = true; return boost::none; } @@ -13618,10 +13620,12 @@ boost::optional<epee::wipeable_string> wallet2::on_device_pin_request() return boost::none; } //---------------------------------------------------------------------------------------------------- -boost::optional<epee::wipeable_string> wallet2::on_device_passphrase_request(bool on_device) +boost::optional<epee::wipeable_string> wallet2::on_device_passphrase_request(bool & on_device) { if (nullptr != m_callback) return m_callback->on_device_passphrase_request(on_device); + else + on_device = true; return boost::none; } //---------------------------------------------------------------------------------------------------- |