rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-29 18:53:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1733

Browse source 
a493c0b1 BACKGROUND_MINING_MINER_MONITOR_INVERVAL_IN_SECONDS was odr-used, so required a definition. (Dion Ahmetaj)
This commit is contained in:
Riccardo Spagni 2017-02-21 11:21:14 +02:00
commit 6994c85201
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/cryptonote_basic/miner.cpp
View file

@ -580,10 +580,9 @@ namespace cryptonote
// If we're already mining, then sleep for the miner monitor interval. // If we're already mining, then sleep for the miner monitor interval.
// If we're NOT mining, then sleep for the idle monitor interval // If we're NOT mining, then sleep for the idle monitor interval
boost::this_thread::sleep_for( uint64_t sleep_for_seconds = BACKGROUND_MINING_MINER_MONITOR_INVERVAL_IN_SECONDS;
m_is_background_mining_started ? if( !m_is_background_mining_started ) sleep_for_seconds = get_min_idle_seconds();
boost::chrono::seconds( BACKGROUND_MINING_MINER_MONITOR_INVERVAL_IN_SECONDS ) : boost::this_thread::sleep_for(boost::chrono::seconds(sleep_for_seconds));
boost::chrono::seconds( get_min_idle_seconds() ) );
} }
catch(const boost::thread_interrupted&) catch(const boost::thread_interrupted&)
{ {