mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-14 04:16:33 +02:00
Merge pull request #125
5c330b0
remove PR #111 dependency (Jacob Brydolf)af933da
disconnect slots before reconnecting (Jacob Brydolf)
This commit is contained in:
commit
2bb20cd67e
16
main.qml
16
main.qml
@ -148,6 +148,12 @@ ApplicationWindow {
|
||||
translationManager.setLanguage(locale.split("_")[0]);
|
||||
}
|
||||
|
||||
// disconnect handlers before connecting
|
||||
middlePanel.paymentClicked.disconnect(handlePayment);
|
||||
// TODO: remove if statement when PR #111 is merged
|
||||
if(typeof(handleCheckPayment) !== "undefined") {
|
||||
middlePanel.checkPaymentClicked.disconnect(handleCheckPayment);
|
||||
}
|
||||
middlePanel.paymentClicked.connect(handlePayment);
|
||||
// basicPanel.paymentClicked.connect(handlePayment);
|
||||
middlePanel.checkPaymentClicked.connect(handleCheckPayment);
|
||||
@ -192,11 +198,21 @@ ApplicationWindow {
|
||||
function connectWallet(wallet) {
|
||||
showProcessingSplash()
|
||||
currentWallet = wallet
|
||||
|
||||
// Disconnect before connecting
|
||||
currentWallet.refreshed.disconnect(onWalletRefresh)
|
||||
currentWallet.updated.disconnect(onWalletUpdate)
|
||||
currentWallet.newBlock.disconnect(onWalletNewBlock)
|
||||
currentWallet.moneySpent.disconnect(onWalletMoneySent)
|
||||
currentWallet.moneyReceived.disconnect(onWalletMoneyReceived)
|
||||
|
||||
currentWallet.refreshed.connect(onWalletRefresh)
|
||||
currentWallet.updated.connect(onWalletUpdate)
|
||||
currentWallet.newBlock.connect(onWalletNewBlock)
|
||||
currentWallet.moneySpent.connect(onWalletMoneySent)
|
||||
currentWallet.moneyReceived.connect(onWalletMoneyReceived)
|
||||
|
||||
|
||||
console.log("initializing with daemon address: ", persistentSettings.daemon_address)
|
||||
console.log("Recovering from seed: ", persistentSettings.is_recovering)
|
||||
console.log("restore Height", persistentSettings.restore_height)
|
||||
|
Loading…
Reference in New Issue
Block a user