From 6b52aad3c8c69e4e90203d9e12faf7ff04a3f46e Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Fri, 14 Jul 2023 10:28:50 +0200 Subject: [PATCH] qml: silence some null deref errors at shutdown --- electrum/gui/qml/components/main.qml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/electrum/gui/qml/components/main.qml b/electrum/gui/qml/components/main.qml index e49f88ec9..13ad78acc 100644 --- a/electrum/gui/qml/components/main.qml +++ b/electrum/gui/qml/components/main.qml @@ -121,7 +121,8 @@ ApplicationWindow MouseArea { anchors.fill: parent - enabled: Daemon.currentWallet && (!stack.currentItem.title || stack.currentItem.title == Daemon.currentWallet.name) + enabled: Daemon.currentWallet && + (!stack.currentItem || !stack.currentItem.title || stack.currentItem.title == Daemon.currentWallet.name) onClicked: { stack.getRoot().menu.open() // open wallet-menu stack.getRoot().menu.y = toolbar.height @@ -139,14 +140,15 @@ ApplicationWindow Image { Layout.preferredWidth: constants.iconSizeSmall Layout.preferredHeight: constants.iconSizeSmall - visible: Daemon.currentWallet && (!stack.currentItem.title || stack.currentItem.title == Daemon.currentWallet.name) + visible: Daemon.currentWallet && + (!stack.currentItem || !stack.currentItem.title || stack.currentItem.title == Daemon.currentWallet.name) source: '../../icons/wallet.png' } Label { Layout.fillWidth: true Layout.preferredHeight: Math.max(implicitHeight, toolbarTopLayout.height) - text: stack.currentItem.title + text: stack.currentItem && stack.currentItem.title ? stack.currentItem.title : Daemon.currentWallet.name elide: Label.ElideRight