Merge pull request #3255

3962bcb2 Closes #2886: really ignore battery checking (Timothy D. Prime)

src/cryptonote_basic/miner.cpp

@@ -624,21 +624,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 )
       {