fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'donate'

Browse source
This commit is contained in:
enWILLYado 2018-03-02 00:15:38 +01:00
commit 2ec5d97cc1
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/net/strategies/DonateStrategy.cpp
View file

@ -93,28 +93,31 @@ DonateStrategy::DonateStrategy(const std::string & agent, IStrategyListener* lis
bool DonateStrategy::reschedule(const bool isDonate)
{
if(isDonate)
if(m_starting == true || m_active == true)
{
const uint64_t donateTargetTicks = Options::i()->donateMinutes() * C_TICKS_PER_MINUTE;
LOG_DEBUG("Dev donate ticks: " << m_donateTicks << "/" << donateTargetTicks);
LOG_DEBUG("Dev donate ticks: " << m_donateTicks << "->" << donateTargetTicks);
if(m_donateTicks < donateTargetTicks)
{
return false;
return !isDonate;
}
m_target = std::max(int(C_ONE_CICLE_IN_TICKS - m_donateTicks), int(C_ONE_TICK)) + m_ticks;
LOG_NOTICE("Dev donate: finished!");
stop();
return isDonate;
}
else
{
if(m_starting == true || m_active == true)
if(isDonate)
{
// WHY?
return false;
}
LOG_DEBUG("Non-Dev donate ticks: " << m_ticks << "/" << m_target);
LOG_DEBUG("Non-Dev donate ticks: " << m_ticks << "->" << m_target);
if(m_ticks < m_target)
{
return false;
@ -122,9 +125,9 @@ bool DonateStrategy::reschedule(const bool isDonate)
LOG_NOTICE("Dev donate: start!");
connect();
}
return true;
}
}
int64_t DonateStrategy::submit(const JobResult & result)