diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2017-10-24 14:35:44 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2017-10-24 14:35:44 -0500 |
| commit | 6f14fde89c98eee723755f6505707fb8c7b0e63d (patch) | |
| tree | 54451e928423135e08d78f75c7eb635e91699a0a | |
| parent | 7340371cc90fe71ef042b4e9b08ddcbfa7d2f1bc (diff) | |
| parent | d8ebafaec0384ad0de10d66572c733972d2b9487 (diff) | |
| download | monzero-gui-6f14fde89c98eee723755f6505707fb8c7b0e63d.tar.gz monzero-gui-6f14fde89c98eee723755f6505707fb8c7b0e63d.tar.xz monzero-gui-6f14fde89c98eee723755f6505707fb8c7b0e63d.zip | |
Merge pull request #929
d8ebafa show correct height after switching wallets
| -rw-r--r-- | pages/Settings.qml | 2 | ||||
| -rw-r--r-- | src/libwalletqt/Wallet.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pages/Settings.qml b/pages/Settings.qml index b5b960c8..61e1cd16 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -506,7 +506,6 @@ Rectangle { onLinkActivated: { restoreHeightRow.visible = true; - text = txt } } @@ -538,7 +537,6 @@ Rectangle { currentWallet.walletCreationHeight = restoreHeight.text // Restore height is saved in .keys file. Set password to trigger rewrite. currentWallet.setPassword(appWindow.password) - restoreHeightText.text = restoreHeightText.txt + restoreHeightText.linkTxt restoreHeightRow.visible = false // Show confirmation dialog diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 4238940a..8525bf3a 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -207,6 +207,7 @@ void Wallet::initAsync(const QString &daemonAddress, quint64 upperTransactionLim QFuture<bool> future = watcher->future(); watcher->deleteLater(); if(future.result()){ + emit walletCreationHeightChanged(); qDebug() << "init async finished - starting refresh"; connected(true); m_walletImpl->startRefresh(); |