diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-26 17:38:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-26 17:39:16 +0200 |
| commit | b9bd6282c5d1d8c72c8731df202b3e4f7d60f340 (patch) | |
| tree | 671dc202d38f299fc5316a94c1fcb6de6172278b /src/qt/bitcoin.cpp | |
| parent | 3da58b216b5726461b45685aa99cab9deb78c6fd (diff) | |
| parent | b197bf3270490068319d87e4b977b08f754a1307 (diff) | |
| download | bitcoin-b9bd6282c5d1d8c72c8731df202b3e4f7d60f340.tar.xz | |
Merge pull request #4649
b197bf3 [Qt] disable tray interactions when client model set to 0 (Philip Kaufmann)
314fbd9 [Qt] use BitcoinGUI::DEFAULT_WALLET constant in bitcoin.cpp (Philip Kaufmann)
8ca6a16 [Qt] ensure all class attributes are init to 0 (Philip Kaufmann)
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 12277a8ad0..6cc6b99ceb 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -415,8 +415,8 @@ void BitcoinApplication::initializeResult(int retval) { walletModel = new WalletModel(pwalletMain, optionsModel); - window->addWallet("~Default", walletModel); - window->setCurrentWallet("~Default"); + window->addWallet(BitcoinGUI::DEFAULT_WALLET, walletModel); + window->setCurrentWallet(BitcoinGUI::DEFAULT_WALLET); connect(walletModel, SIGNAL(coinsSent(CWallet*,SendCoinsRecipient,QByteArray)), paymentServer, SLOT(fetchPaymentACK(CWallet*,const SendCoinsRecipient&,QByteArray))); |