monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-16 15:58:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2223

Browse source 
d237e70 main: fix false positive daemonRunning (invalid daemon address check) (xiphon)
This commit is contained in:
luigi1111 2019-06-21 14:41:05 -05:00
commit 27ad473695
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
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

@ -471,14 +471,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;
@ -1359,7 +1359,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