aboutsummaryrefslogtreecommitdiff
path: root/src/qt/optionsmodel.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2013-07-24 22:52:21 -0700
committerGavin Andresen <[email protected]>2013-07-24 22:52:21 -0700
commit5e67e124cfb3fbda4023fb972e377d76d12548dd (patch)
treeccd18d8b52046ed16bc4f5886e4afc8c1aabca04 /src/qt/optionsmodel.cpp
parentMerge pull request #2795 from fanquake/log_aborted_rebuilds (diff)
parentlet user select wallet file with -wallet=foo.dat (diff)
downloaddiscoin-5e67e124cfb3fbda4023fb972e377d76d12548dd.tar.xz
discoin-5e67e124cfb3fbda4023fb972e377d76d12548dd.zip
Merge pull request #1889 from tcatm/multi-wallet
let user select wallet file with -wallet=foo.dat
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 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";