From 3962bcb2a2d2137b766353a0a7dd424b4e3fe213 Mon Sep 17 00:00:00 2001 From: "Timothy D. Prime" Date: Mon, 12 Feb 2018 10:29:22 -0800 Subject: Closes #2886: really ignore battery checking Move option test first. --- src/cryptonote_basic/miner.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src/cryptonote_basic') diff --git a/src/cryptonote_basic/miner.cpp b/src/cryptonote_basic/miner.cpp index 670baea50..4df28365e 100644 --- a/src/cryptonote_basic/miner.cpp +++ b/src/cryptonote_basic/miner.cpp @@ -623,21 +623,15 @@ namespace cryptonote continue; // if interrupted because stop called, loop should end .. } - boost::tribool battery_powered(on_battery_power()); - bool on_ac_power = false; - if(indeterminate( battery_powered )) + bool on_ac_power = m_ignore_battery; + if(!m_ignore_battery) { - // name could be better, only ignores battery requirement if we failed - // to get the status of the system - if( m_ignore_battery ) + boost::tribool battery_powered(on_battery_power()); + if(!indeterminate( battery_powered )) { - on_ac_power = true; + on_ac_power = !battery_powered; } } - else - { - on_ac_power = !battery_powered; - } if( m_is_background_mining_started ) { -- cgit v1.2.3