From 86e9f3811be3eab74230a79c329179cfef5eab5b Mon Sep 17 00:00:00 2001 From: Jaquee Date: Mon, 4 Sep 2017 13:42:46 +0200 Subject: [PATCH] Only prompt for daemon auto start when daemon address is local --- main.qml | 12 +++++++++++- pages/Mining.qml | 10 ---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/main.qml b/main.qml index b51ff61a..e5d312d1 100644 --- a/main.qml +++ b/main.qml @@ -302,7 +302,7 @@ ApplicationWindow { middlePanel.transferView.updatePriorityDropdown(); // If wallet isnt connected and no daemon is running - Ask - if(!walletInitialized && status === Wallet.ConnectionStatus_Disconnected && !daemonManager.running(persistentSettings.testnet)){ + if(isDaemonLocal() && !walletInitialized && status === Wallet.ConnectionStatus_Disconnected && !daemonManager.running(persistentSettings.testnet)){ daemonManagerDialog.open(); } // initialize transaction history once wallet is initialized first time; @@ -1376,4 +1376,14 @@ ApplicationWindow { onTriggered: checkUpdates() } + function isDaemonLocal() { + var daemonAddress = appWindow.persistentSettings.daemon_address + if (daemonAddress === "") + return false + var daemonHost = daemonAddress.split(":")[0] + if (daemonHost === "127.0.0.1" || daemonHost === "localhost") + return true + return false + } + } diff --git a/pages/Mining.qml b/pages/Mining.qml index 985c9cdc..68e5ff21 100644 --- a/pages/Mining.qml +++ b/pages/Mining.qml @@ -37,16 +37,6 @@ Rectangle { color: "#F0EEEE" property var currentHashRate: 0 - function isDaemonLocal() { - var daemonAddress = appWindow.persistentSettings.daemon_address - if (daemonAddress === "") - return false - var daemonHost = daemonAddress.split(":")[0] - if (daemonHost === "127.0.0.1" || daemonHost === "localhost") - return true - return false - } - /* main layout */ ColumnLayout { id: mainLayout