aboutsummaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2018-05-07 15:51:53 -0500
committerluigi1111 <luigi1111w@gmail.com>2018-05-07 15:51:53 -0500
commitb56074bef1b789ca258cb3bacaad2693be2c3e2d (patch)
tree13e01e1a9313231bc693ff50fa864f4dfb08102e /pages
parentff3987ccab3626f8a8354fee8b3557567e73594e (diff)
parent6147d81cc58fd4685d9f3f02f79f7a8bd89e1708 (diff)
downloadmonzero-gui-b56074bef1b789ca258cb3bacaad2693be2c3e2d.tar.gz
monzero-gui-b56074bef1b789ca258cb3bacaad2693be2c3e2d.tar.xz
monzero-gui-b56074bef1b789ca258cb3bacaad2693be2c3e2d.zip
Merge pull request #1366
6147d81 Fix use of persistentSettings.testnet to nettype
Diffstat (limited to 'pages')
-rw-r--r--pages/Settings.qml2
-rw-r--r--pages/Transfer.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/pages/Settings.qml b/pages/Settings.qml
index 30ae0c29..857e5612 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -51,7 +51,7 @@ Rectangle {
console.log("Settings page loaded");
if(typeof daemonManager != "undefined"){
- appWindow.daemonRunning = persistentSettings.useRemoteNode ? false : daemonManager.running(persistentSettings.testnet);
+ appWindow.daemonRunning = persistentSettings.useRemoteNode ? false : daemonManager.running(persistentSettings.nettype);
}
logLevelDropdown.update()
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 97381f47..8a029deb 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -287,7 +287,7 @@ Rectangle {
if (result) {
var parts = result.split("|")
if (parts.length == 2) {
- var address_ok = walletManager.addressValid(parts[1], appWindow.persistentSettings.testnet)
+ var address_ok = walletManager.addressValid(parts[1], appWindow.persistentSettings.nettype)
if (parts[0] === "true") {
if (address_ok) {
addressLine.text = parts[1]