diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-03-29 09:54:00 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-03-29 09:54:00 +0100 |
commit | a6d32c94ab91e84fc359e9b97561ae9da06c1abc (patch) | |
tree | b798ce036531c979d47d6f78ff596afaeffc706d /src/qt/bitcoin.cpp | |
parent | 1be4bbadc74d9fa8f987f91df973733c6fef7a56 (diff) | |
parent | 67155d9299ef75cc73272a259dbfbf72632c3020 (diff) | |
download | bitcoin-a6d32c94ab91e84fc359e9b97561ae9da06c1abc.tar.xz |
Merge remote-tracking branch 'codeshark/multiwallet-qt-no-core' (pull #2220)
Conflicts:
src/qt/bitcoingui.cpp
Diffstat (limited to 'src/qt/bitcoin.cpp')
-rw-r--r-- | src/qt/bitcoin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index e3d51be54a..346128c0c4 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -232,7 +232,8 @@ int main(int argc, char *argv[]) WalletModel walletModel(pwalletMain, &optionsModel); window.setClientModel(&clientModel); - window.setWalletModel(&walletModel); + window.addWallet("~Default", &walletModel); + window.setCurrentWallet("~Default"); // If -min option passed, start window minimized. if(GetBoolArg("-min")) @@ -253,7 +254,7 @@ int main(int argc, char *argv[]) window.hide(); window.setClientModel(0); - window.setWalletModel(0); + window.removeAllWallets(); guiref = 0; } // Shutdown the core and its threads, but don't exit Bitcoin-Qt here |