mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #12795: do not truncate .dat extension for wallets in gui

Browse Source 
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
This commit is contained in:
Jonas Schnelli committed 2018-03-27 15:14:20 +07:00
2 parents 17b246f4b3 fc7c32fc68
commit 68484d64fd
1 file changed
+1 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/qt/walletmodel.cpp
+1 -5
View File
@@ -748,11 +748,7 @@ int WalletModel::getDefaultConfirmTarget() const
QString WalletModel::getWalletName() const QString WalletModel::getWalletName() const
{ {
LOCK(wallet->cs_wallet); LOCK(wallet->cs_wallet);
QString walletName = QString::fromStdString(wallet->GetName()); return QString::fromStdString(wallet->GetName());
if (walletName.endsWith(".dat")) {
walletName.truncate(walletName.size() - 4);
}
return walletName;
} }
bool WalletModel::isMultiwallet() bool WalletModel::isMultiwallet()