Skip to content
Permalink
Browse files

main: fix false positive daemonRunning (invalid daemon address check)

  • Loading branch information...
xiphon committed Jun 18, 2019
1 parent 68c7cf7 commit c3647c1c5e59598be85a654d559a408f48e51100
Showing with 2 additions and 3 deletions.
  1. +2 −3 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(appWindow.persistentSettings.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(appWindow.persistentSettings.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

0 comments on commit c3647c1

Please sign in to comment.
You can’t perform that action at this time.