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

Merge pull request #929

Browse source 
d8ebafa show correct height after switching wallets
This commit is contained in:
luigi1111 2017-10-24 14:35:44 -05:00
commit 6f14fde89c
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pages/Settings.qml
View file

@ -506,7 +506,6 @@ Rectangle {
onLinkActivated: { onLinkActivated: {
restoreHeightRow.visible = true; restoreHeightRow.visible = true;
text = txt
} }
} }
@ -538,7 +537,6 @@ Rectangle {
currentWallet.walletCreationHeight = restoreHeight.text currentWallet.walletCreationHeight = restoreHeight.text
// Restore height is saved in .keys file. Set password to trigger rewrite. // Restore height is saved in .keys file. Set password to trigger rewrite.
currentWallet.setPassword(appWindow.password) currentWallet.setPassword(appWindow.password)
restoreHeightText.text = restoreHeightText.txt + restoreHeightText.linkTxt
restoreHeightRow.visible = false restoreHeightRow.visible = false
// Show confirmation dialog // Show confirmation dialog

1
src/libwalletqt/Wallet.cpp
View file

@ -207,6 +207,7 @@ void Wallet::initAsync(const QString &daemonAddress, quint64 upperTransactionLim
QFuture<bool> future = watcher->future(); QFuture<bool> future = watcher->future();
watcher->deleteLater(); watcher->deleteLater();
if(future.result()){ if(future.result()){
emit walletCreationHeightChanged();
qDebug() << "init async finished - starting refresh"; qDebug() << "init async finished - starting refresh";
connected(true); connected(true);
m_walletImpl->startRefresh(); m_walletImpl->startRefresh();