From d237e70ef1f77bef097db782a4e346b413ce0f80 Mon Sep 17 00:00:00 2001 From: xiphon Date: Tue, 18 Jun 2019 00:11:14 +0000 Subject: [PATCH] main: fix false positive daemonRunning (invalid daemon address check) --- main.qml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main.qml b/main.qml index 3299c629..ac46b167 100644 --- a/main.qml +++ b/main.qml @@ -470,14 +470,14 @@ ApplicationWindow { leftPanel.networkStatus.connected = status // update local daemon status. - if(!isMobile && walletManager.isDaemonLocal(appWindow.persistentSettings.daemon_address)) + if(!isMobile && walletManager.isDaemonLocal(currentDaemonAddress)) daemonRunning = status; // Update fee multiplier dropdown on transfer page middlePanel.transferView.updatePriorityDropdown(); // If wallet isnt connected, advanced wallet mode and no daemon is running - Ask - if(!isMobile && appWindow.walletMode >= 2 && walletManager.isDaemonLocal(appWindow.persistentSettings.daemon_address) && !walletInitialized && status === Wallet.ConnectionStatus_Disconnected && !daemonManager.running(persistentSettings.nettype)){ + if(!isMobile && appWindow.walletMode >= 2 && walletManager.isDaemonLocal(currentDaemonAddress) && !walletInitialized && status === Wallet.ConnectionStatus_Disconnected && !daemonManager.running(persistentSettings.nettype)){ daemonManagerDialog.open(); } // initialize transaction history once wallet is initialized first time; @@ -1350,7 +1350,6 @@ ApplicationWindow { property bool allow_background_mining : false property bool miningIgnoreBattery : true property var nettype: NetworkType.MAINNET - property string daemon_address: "localhost:" + getDefaultDaemonRpcPort(nettype) property string payment_id property int restore_height : 0 property bool is_trusted_daemon : false