Merge pull request #519

223f09d preparations for background mining requires #1827 (Jaquee)
2017-03-03 16:55:22 +02:00
parent 5db9bd9fdd 223f09dc94
commit 2e3350c060
5 changed files with 50 additions and 5 deletions
--- a/main.qml
+++ b/main.qml
@@ -822,6 +822,7 @@ ApplicationWindow {
        property bool   auto_donations_enabled : false
        property int    auto_donations_amount : 50
        property bool   allow_background_mining : false
+        property bool   miningIgnoreBattery : true
        property bool   testnet: false
        property string daemon_address: "localhost:18081"
        property string payment_id
@@ -861,7 +862,7 @@ ApplicationWindow {
                return;
            } else
                handleTransactionConfirmed()
-        }        
+        }
    }

    StandardDialog {