Merge pull request #6341

927fd47 simplewallet: fix smart mining not starting after first setup (moneromooo-monero)
This commit is contained in:
luigi1111 2020-04-10 15:59:14 -05:00
commit 53800b3b63
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -5199,8 +5199,11 @@ void simple_wallet::check_background_mining(const epee::wipeable_string &passwor
if (is_background_mining_enabled) if (is_background_mining_enabled)
{ {
// already active, nice // already active, nice
m_wallet->setup_background_mining(tools::wallet2::BackgroundMiningYes); if (setup == tools::wallet2::BackgroundMiningMaybe)
m_wallet->rewrite(m_wallet_file, password); {
m_wallet->setup_background_mining(tools::wallet2::BackgroundMiningYes);
m_wallet->rewrite(m_wallet_file, password);
}
start_background_mining(); start_background_mining();
return; return;
} }
@ -5223,6 +5226,11 @@ void simple_wallet::check_background_mining(const epee::wipeable_string &passwor
m_wallet->rewrite(m_wallet_file, password); m_wallet->rewrite(m_wallet_file, password);
start_background_mining(); start_background_mining();
} }
else
{
// the setting is already enabled, and the daemon is not mining yet, so start it
start_background_mining();
}
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
bool simple_wallet::start_mining(const std::vector<std::string>& args) bool simple_wallet::start_mining(const std::vector<std::string>& args)