diff options
| author | Nils Schneider <[email protected]> | 2012-06-03 01:19:07 +0200 |
|---|---|---|
| committer | Nils Schneider <[email protected]> | 2013-07-04 17:19:36 +0200 |
| commit | 674cb304b376358fdcb17b4a0b16ae7b00cdbedc (patch) | |
| tree | 19b8d2f5da361b38fc0eedc59d32d1090071d4da /src/qt/optionsmodel.cpp | |
| parent | Merge pull request #2793 from Diapolo/translations (diff) | |
| download | discoin-674cb304b376358fdcb17b4a0b16ae7b00cdbedc.tar.xz discoin-674cb304b376358fdcb17b4a0b16ae7b00cdbedc.zip | |
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.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 6b1b4e3d8..7ebe5b475 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"; |