Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-26 20:19:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2972

Browse Source 
586ee642 simplewallet: lock idle scope in {im,ex}port_{key_images,outputs} (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-01-10 11:48:12 +01:00
commit c951bf1f72
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/simplewallet/simplewallet.cpp
View File

@ -6195,6 +6195,7 @@ bool simple_wallet::export_key_images(const std::vector<std::string> &args)
try try
{ {
LOCK_IDLE_SCOPE();
if (!m_wallet->export_key_images(filename)) if (!m_wallet->export_key_images(filename))
{ {
fail_msg_writer() << tr("failed to save file ") << filename; fail_msg_writer() << tr("failed to save file ") << filename;
@ -6227,6 +6228,7 @@ bool simple_wallet::import_key_images(const std::vector<std::string> &args)
} }
std::string filename = args[0]; std::string filename = args[0];
LOCK_IDLE_SCOPE();
try try
{ {
uint64_t spent = 0, unspent = 0; uint64_t spent = 0, unspent = 0;
@ -6258,6 +6260,7 @@ bool simple_wallet::export_outputs(const std::vector<std::string> &args)
if (m_wallet->ask_password() && !get_and_verify_password()) { return true; } if (m_wallet->ask_password() && !get_and_verify_password()) { return true; }
std::string filename = args[0]; std::string filename = args[0];
LOCK_IDLE_SCOPE();
try try
{ {
std::vector<tools::wallet2::transfer_details> outs = m_wallet->export_outputs(); std::vector<tools::wallet2::transfer_details> outs = m_wallet->export_outputs();
@ -6356,6 +6359,7 @@ bool simple_wallet::import_outputs(const std::vector<std::string> &args)
boost::archive::binary_iarchive ar(iss); boost::archive::binary_iarchive ar(iss);
ar >> outputs; ar >> outputs;
} }
LOCK_IDLE_SCOPE();
size_t n_outputs = m_wallet->import_outputs(outputs); size_t n_outputs = m_wallet->import_outputs(outputs);
success_msg_writer() << boost::lexical_cast<std::string>(n_outputs) << " outputs imported"; success_msg_writer() << boost::lexical_cast<std::string>(n_outputs) << " outputs imported";
} }