diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2018-03-27 15:14:01 +0700 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2018-03-27 15:14:20 +0700 |
| commit | 68484d64fd79f3ef7b32d0785fc94f97eb87c60b (patch) | |
| tree | 7f3f5ff2893f722603f735400fced3c0f63f747e /src | |
| parent | 17b246f4b3f57d1fd7889e8375176a0e2d3b14bb (diff) | |
| parent | fc7c32fc68f2c2618644f9bea6176c63940706b3 (diff) | |
| download | bitcoin-68484d64fd79f3ef7b32d0785fc94f97eb87c60b.tar.xz | |
Merge #12795: do not truncate .dat extension for wallets in gui
fc7c32fc6 do not truncate .dat extension for wallets in gui (Gregory Sanders)
Pull request description:
Truncating the extension results in wallet name ambiguity and the inability to use the wallet in GUI debug rpc console.
Resolves #12794
Tree-SHA512: 89507918f597e9274148b45233b893c9f653da4f9e929415822165d47c67b55ad0b2d5ff53b508e942831d5213d5c15bce3fbdfbcb592a5c7f3dd5c1ca02cfb8
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/walletmodel.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 555a21e8c5..795302be58 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -748,11 +748,7 @@ int WalletModel::getDefaultConfirmTarget() const QString WalletModel::getWalletName() const { LOCK(wallet->cs_wallet); - QString walletName = QString::fromStdString(wallet->GetName()); - if (walletName.endsWith(".dat")) { - walletName.truncate(walletName.size() - 4); - } - return walletName; + return QString::fromStdString(wallet->GetName()); } bool WalletModel::isMultiwallet() |