Merge pull request #709

62e1dc4 Setttings: blockchain folder location (Jaquee) 9037eed DaemonManager: support dataDir parameter + validator (Jaquee)
2017-06-04 12:17:58 +02:00
parent 9e121fb676 62e1dc490f
commit ecaa1a8e23
4 changed files with 145 additions and 6 deletions
--- a/main.qml
+++ b/main.qml
@@ -405,7 +405,7 @@ ApplicationWindow {
        currentWallet.pauseRefresh();

        appWindow.showProcessingSplash(qsTr("Waiting for daemon to start..."))
-        daemonManager.start(flags, persistentSettings.testnet);
+        daemonManager.start(flags, persistentSettings.testnet, persistentSettings.blockchainDataDir);
        persistentSettings.daemonFlags = flags
    }

@@ -884,6 +884,7 @@ ApplicationWindow {
        property string daemonUsername: ""
        property string daemonPassword: ""
        property bool transferShowAdvanced: false
+        property string blockchainDataDir: ""
    }

    // Information dialog