aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaquee <jaquee.monero@gmail.com>2017-09-04 13:42:46 +0200
committerJaquee <jaquee.monero@gmail.com>2017-09-04 13:42:46 +0200
commit86e9f3811be3eab74230a79c329179cfef5eab5b (patch)
treef5ff805a81b4ac893f63e3b2a56709ac3dc34d3f
parentd0f3194574ab4a7b163d43b57011d807bfc3e0a4 (diff)
downloadmonzero-gui-86e9f3811be3eab74230a79c329179cfef5eab5b.tar.gz
monzero-gui-86e9f3811be3eab74230a79c329179cfef5eab5b.tar.xz
monzero-gui-86e9f3811be3eab74230a79c329179cfef5eab5b.zip
Only prompt for daemon auto start when daemon address is local
-rw-r--r--main.qml12
-rw-r--r--pages/Mining.qml10
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