Merge pull request #442

0b41fbc Don't close/reopen when changing daemon requires #1655 (Jaquee)
2586404 sync progress improvements (Jaquee)
eb909e1 async connectionStatus and init (Jaquee)
cb3281d WalletManager: fix possible race (Jaquee)
9dbbd4c WalletManager: check connection before isMining() (Jaquee)
This commit is contained in:
Riccardo Spagni
2017-02-04 17:46:57 +02:00
7 changed files with 96 additions and 45 deletions

View File

@@ -324,8 +324,8 @@ Rectangle {
var newDaemon = daemonAddr.text + ":" + daemonPort.text
if(persistentSettings.daemon_address != newDaemon) {
persistentSettings.daemon_address = newDaemon
//reconnect wallet
appWindow.initialize();
//Reinit wallet
currentWallet.initAsync(newDaemon)
}
}
}

View File

@@ -682,7 +682,6 @@ Rectangle {
//TODO: enable send page when we're connected and daemon is synced
function updateStatus() {
console.log("updated transfer page status")
if(typeof currentWallet === "undefined") {
statusText.text = qsTr("Wallet is not connected to daemon.") + "<br>" + root.startLinkText
return;