AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: silence some null deref errors at shutdown

Browse Source
This commit is contained in:
Sander van Grieken
2023-07-14 10:28:50 +02:00
parent 60e007862b
commit 6b52aad3c8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/gui/qml/components/main.qml
View File

@@ -121,7 +121,8 @@ ApplicationWindow
MouseArea { MouseArea {
anchors.fill: parent 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: { onClicked: {
stack.getRoot().menu.open() // open wallet-menu stack.getRoot().menu.open() // open wallet-menu
stack.getRoot().menu.y = toolbar.height stack.getRoot().menu.y = toolbar.height
@@ -139,14 +140,15 @@ ApplicationWindow
Image { Image {
Layout.preferredWidth: constants.iconSizeSmall Layout.preferredWidth: constants.iconSizeSmall
Layout.preferredHeight: 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' source: '../../icons/wallet.png'
} }
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: Math.max(implicitHeight, toolbarTopLayout.height) Layout.preferredHeight: Math.max(implicitHeight, toolbarTopLayout.height)
text: stack.currentItem.title text: stack.currentItem && stack.currentItem.title
? stack.currentItem.title ? stack.currentItem.title
: Daemon.currentWallet.name : Daemon.currentWallet.name
elide: Label.ElideRight elide: Label.ElideRight