diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-02-18 11:14:50 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-02-18 11:14:50 +0200 |
| commit | 1a0fa56189351f7de8788929ddf452a35b8d96f8 (patch) | |
| tree | 76e3981b16bbc70d87ec9fbc444d3959d436f823 /src | |
| parent | Merge pull request #5151 (diff) | |
| parent | CMakeLists.txt: detect and use -pthread compiler flag (diff) | |
| download | monero-1a0fa56189351f7de8788929ddf452a35b8d96f8.tar.xz | |
Merge pull request #5153
32ebc95d CMakeLists.txt: detect and use -pthread compiler flag (moneromooo-monero)
be2d061b miner: fix build with boost 1.69 (moneromooo-monero)
1de62cb1 mlocker: fix access to global lock map after dtor on exit (moneromooo-monero)
5544bb83 mlocker: fix dtor ordering problem (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptonote_basic/miner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_basic/miner.cpp b/src/cryptonote_basic/miner.cpp index 2bd43de94..fb373c6aa 100644 --- a/src/cryptonote_basic/miner.cpp +++ b/src/cryptonote_basic/miner.cpp @@ -637,7 +637,7 @@ namespace cryptonote boost::tribool battery_powered(on_battery_power()); if(!indeterminate( battery_powered )) { - on_ac_power = !battery_powered; + on_ac_power = !(bool)battery_powered; } } |