diff options
| author | fanquake <fanquake@gmail.com> | 2019-12-09 09:21:59 -0500 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-12-09 09:35:33 -0500 |
| commit | c8e65ade095b01977c5557e6cf3b0f2d4a6e91e4 (patch) | |
| tree | 8025aad9e9d147e44971e4406e858bf537af95a2 | |
| parent | 1ebf6402fc7cc7f918f276ee6fde369ba813beb2 (diff) | |
| parent | d65fafc2f7d98ab2be0a0961e7a3ebe7850c1dca (diff) | |
Merge #17695: gui: disable File->CreateWallet during startup
d65fafc2f7d98ab2be0a0961e7a3ebe7850c1dca gui: disable File->CreateWallet during startup (fanquake)
Pull request description:
Same as #16118. Early calls to Create Wallet will crash bitcoin-qt.
```bash
lldb /Applications/Bitcoin-Qt.app/Contents/MacOS/Bitcoin-Qt -- --regtest -debug
Process 18143 launched: '/Users/michael/github/bitcoin/src/qt/bitcoin-qt' (x86_64)
2019-12-07 15:49:37.823867-0500 bitcoin-qt[18143:5696499] MessageTracer: Falling back to default whitelist
Process 18143 stopped
* thread #1, queue = 'com.apple.main-thread', stop reason = EXC_BAD_ACCESS (code=1, address=0x18)
frame #0: 0x00000001000d2d9d bitcoin-qt`CreateWalletActivity::createWallet() + 381
bitcoin-qt`CreateWalletActivity::createWallet:
-> 0x1000d2d9d <+381>: movq 0x18(%rax), %r14
0x1000d2da1 <+385>: movq %r15, -0xa8(%rbp)
0x1000d2da8 <+392>: leaq -0xa0(%rbp), %r12
0x1000d2daf <+399>: leaq -0x80(%rbp), %rsi
Target 0: (bitcoin-qt) stopped.
(lldb) bt
* thread #1, queue = 'com.apple.main-thread', stop reason = EXC_BAD_ACCESS (code=1, address=0x18)
* frame #0: 0x00000001000d2d9d bitcoin-qt`CreateWalletActivity::createWallet() + 381
frame #1: 0x0000000100833e6f bitcoin-qt`QMetaObject::activate(QObject*, int, int, void**) + 1631
frame #2: 0x0000000100a1fc47 bitcoin-qt`QDialog::done(int) + 247
frame #3: 0x0000000100833ef5 bitcoin-qt`QMetaObject::activate(QObject*, int, int, void**) + 1765
frame #4: 0x00000001009e04c2 bitcoin-qt`QDialogButtonBoxPrivate::_q_handleButtonClicked() + 786
```
ACKs for top commit:
jonasschnelli:
utACK d65fafc2f7d98ab2be0a0961e7a3ebe7850c1dca
promag:
ACK d65fafc2f7d98ab2be0a0961e7a3ebe7850c1dca.
Tree-SHA512: 12d7f9e8772508bffbb0163849d9eceec5b1c80068c5d377a4d0973c713dc5f8ad38be8f793fec843d7fb604f0e60a72398b0c95f0a8b775dab39d25b29ac046
| -rw-r--r-- | src/qt/bitcoingui.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 2aeba6d82c..8444984b27 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -341,6 +341,7 @@ void BitcoinGUI::createActions() m_close_wallet_action->setStatusTip(tr("Close wallet")); m_create_wallet_action = new QAction(tr("Create Wallet..."), this); + m_create_wallet_action->setEnabled(false); m_create_wallet_action->setStatusTip(tr("Create a new wallet")); showHelpMessageAction = new QAction(tr("&Command-line options"), this); @@ -618,6 +619,7 @@ void BitcoinGUI::setWalletController(WalletController* wallet_controller) m_wallet_controller = wallet_controller; + m_create_wallet_action->setEnabled(true); m_open_wallet_action->setEnabled(true); m_open_wallet_action->setMenu(m_open_wallet_menu); |