4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-14 12:26:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #125

Browse Source 
5c330b0 remove PR #111 dependency (Jacob Brydolf)
af933da disconnect slots before reconnecting (Jacob Brydolf)
This commit is contained in:
Riccardo Spagni 2016-11-09 20:47:35 +02:00
commit 2bb20cd67e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.qml
View File

@ -148,6 +148,12 @@ ApplicationWindow {
translationManager.setLanguage(locale.split("_")[0]); 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); middlePanel.paymentClicked.connect(handlePayment);
// basicPanel.paymentClicked.connect(handlePayment); // basicPanel.paymentClicked.connect(handlePayment);
middlePanel.checkPaymentClicked.connect(handleCheckPayment); middlePanel.checkPaymentClicked.connect(handleCheckPayment);
@ -192,11 +198,21 @@ ApplicationWindow {
function connectWallet(wallet) { function connectWallet(wallet) {
showProcessingSplash() showProcessingSplash()
currentWallet = wallet 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.refreshed.connect(onWalletRefresh)
currentWallet.updated.connect(onWalletUpdate) currentWallet.updated.connect(onWalletUpdate)
currentWallet.newBlock.connect(onWalletNewBlock) currentWallet.newBlock.connect(onWalletNewBlock)
currentWallet.moneySpent.connect(onWalletMoneySent) currentWallet.moneySpent.connect(onWalletMoneySent)
currentWallet.moneyReceived.connect(onWalletMoneyReceived) currentWallet.moneyReceived.connect(onWalletMoneyReceived)
console.log("initializing with daemon address: ", persistentSettings.daemon_address) console.log("initializing with daemon address: ", persistentSettings.daemon_address)
console.log("Recovering from seed: ", persistentSettings.is_recovering) console.log("Recovering from seed: ", persistentSettings.is_recovering)
console.log("restore Height", persistentSettings.restore_height) console.log("restore Height", persistentSettings.restore_height)