Skip to content

Commit f900728

Browse files
fanquakePastaPastaPasta
authored andcommitted
Merge bitcoin#17695: gui: disable File->CreateWallet during startup
d65fafc gui: disable File->CreateWallet during startup (fanquake) Pull request description: Same as bitcoin#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 d65fafc promag: ACK d65fafc. Tree-SHA512: 12d7f9e8772508bffbb0163849d9eceec5b1c80068c5d377a4d0973c713dc5f8ad38be8f793fec843d7fb604f0e60a72398b0c95f0a8b775dab39d25b29ac046
1 parent 08967ac commit f900728

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/qt/bitcoingui.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ void BitcoinGUI::createActions()
435435
m_close_wallet_action->setStatusTip(tr("Close wallet"));
436436

437437
m_create_wallet_action = new QAction(tr("Create Wallet..."), this);
438+
m_create_wallet_action->setEnabled(false);
438439
m_create_wallet_action->setStatusTip(tr("Create a new wallet"));
439440

440441
showHelpMessageAction = new QAction(tr("&Command-line options"), this);
@@ -858,6 +859,7 @@ void BitcoinGUI::setWalletController(WalletController* wallet_controller)
858859

859860
m_wallet_controller = wallet_controller;
860861

862+
m_create_wallet_action->setEnabled(true);
861863
m_open_wallet_action->setEnabled(true);
862864
m_open_wallet_action->setMenu(m_open_wallet_menu);
863865

0 commit comments

Comments
 (0)