Merge pull request #929

d8ebafa show correct height after switching wallets
monero-project · Oct 24, 2017 · 6f14fde · 6f14fde
2 parents 7340371 + d8ebafa
commit 6f14fde
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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();