diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-09 13:03:27 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-09 13:04:02 +0100 |
| commit | b19bcb752bc19f7b6780fd8c099bb3d79e4d7cc9 (patch) | |
| tree | f4039908a6c1e266659e228fe66f45ab78f05e7b /src/qt/bitcoin.cpp | |
| parent | 0514fb3b4cd4e2923d9fdddec84da0c4abcf3e5f (diff) | |
| parent | cdb6c169355488d4e64a2435d916cb67a9c01ebe (diff) | |
| download | bitcoin-b19bcb752bc19f7b6780fd8c099bb3d79e4d7cc9.tar.xz | |
Merge pull request #3638
cdb6c16 remove setting methods in wallet/walletdb (Cozz Lovan)
44eb59e [Qt] remove broken OptionsModel::Upgrade() (Cozz Lovan)
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index e274b7626a..dda79e3d0e 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -376,9 +376,6 @@ void BitcoinApplication::initializeResult(int retval) returnValue = retval ? 0 : 1; if(retval) { - // Miscellaneous initialization after core is initialized - optionsModel->Upgrade(); // Must be done after AppInit2 - #ifdef ENABLE_WALLET PaymentServer::LoadRootCAs(); paymentServer->setOptionsModel(optionsModel); |