Merge pull request #1366

6147d81 Fix use of persistentSettings.testnet to nettype
This commit is contained in:
luigi1111 2018-05-07 15:51:53 -05:00
commit b56074bef1
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 2 additions and 2 deletions

View file

@ -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()

View file

@ -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]