4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-09 19:32:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xiphon 2019-06-18 00:11:14 +00:00
parent 68c7cf7276
commit d237e70ef1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.qml
View File

@ -470,14 +470,14 @@ ApplicationWindow {
leftPanel.networkStatus.connected = status leftPanel.networkStatus.connected = status
// update local daemon status. // update local daemon status.
if(!isMobile && walletManager.isDaemonLocal(appWindow.persistentSettings.daemon_address)) if(!isMobile && walletManager.isDaemonLocal(currentDaemonAddress))
daemonRunning = status; daemonRunning = status;
// Update fee multiplier dropdown on transfer page // Update fee multiplier dropdown on transfer page
middlePanel.transferView.updatePriorityDropdown(); middlePanel.transferView.updatePriorityDropdown();
// If wallet isnt connected, advanced wallet mode and no daemon is running - Ask // 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(); daemonManagerDialog.open();
} }
// initialize transaction history once wallet is initialized first time; // initialize transaction history once wallet is initialized first time;
@ -1350,7 +1350,6 @@ ApplicationWindow {
property bool allow_background_mining : false property bool allow_background_mining : false
property bool miningIgnoreBattery : true property bool miningIgnoreBattery : true
property var nettype: NetworkType.MAINNET property var nettype: NetworkType.MAINNET
property string daemon_address: "localhost:" + getDefaultDaemonRpcPort(nettype)
property string payment_id property string payment_id
property int restore_height : 0 property int restore_height : 0
property bool is_trusted_daemon : false property bool is_trusted_daemon : false