Qt: Get wallet name from WalletModel rather than passing it around

1 files changed, 2 insertions, 7 deletions

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 424d82ae1f..df1be35c8d 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -487,14 +487,9 @@ void BitcoinApplication::initializeResult(bool success)
         for (CWalletRef pwallet : vpwallets) {
             WalletModel * const walletModel = new WalletModel(platformStyle, pwallet, optionsModel);
 
-            QString WalletName = QString::fromStdString(pwallet->GetName());
-            if (WalletName.endsWith(".dat")) {
-                WalletName.truncate(WalletName.size() - 4);
-            }
-
-            window->addWallet(WalletName, walletModel);
+            window->addWallet(walletModel);
             if (fFirstWallet) {
-                window->setCurrentWallet(WalletName);
+                window->setCurrentWallet(walletModel->getWalletName());
                 fFirstWallet = false;
             }