aboutsummaryrefslogtreecommitdiff
path: root/src/qt/optionsmodel.cpp
diff options
context:
space:
mode:
authorNils Schneider <nils.schneider@gmail.com>2012-06-03 01:19:07 +0200
committerNils Schneider <nils@nilsschneider.net>2013-07-04 17:19:36 +0200
commit674cb304b376358fdcb17b4a0b16ae7b00cdbedc (patch)
tree19b8d2f5da361b38fc0eedc59d32d1090071d4da /src/qt/optionsmodel.cpp
parenta4f43075d633cfd60cb1f99fc44d7599109eafef (diff)
let user select wallet file with -wallet=foo.dat
use std::string instead of psz for WalletFile only allow wallets within $DATADIR Use strWalletFile in salvage/recover fix: remove unused variable pszWalletFile move strWalletFile to init.h/init.cpp avoid conversion of strWalletfile to c-string
Diffstat (limited to 'src/qt/optionsmodel.cpp')
-rw-r--r--src/qt/optionsmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 6b1b4e3d8e..7ebe5b4755 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -89,7 +89,7 @@ bool OptionsModel::Upgrade()
settings.setValue("bImportFinished", true);
// Move settings from old wallet.dat (if any):
- CWalletDB walletdb("wallet.dat");
+ CWalletDB walletdb(strWalletFile);
QList<QString> intOptions;
intOptions << "nDisplayUnit" << "nTransactionFee";