From b7bbe7bafb316e640a05c2baac7e7e2efd75061c Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 8 Feb 2023 17:47:45 +0100 Subject: [PATCH] Fix network settings appearing to freeze on errors --- nymea-app/ui/components/MeaDialog.qml | 2 +- nymea-app/ui/system/NetworkSettingsPage.qml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nymea-app/ui/components/MeaDialog.qml b/nymea-app/ui/components/MeaDialog.qml index 53c00c6a..93feb2f5 100644 --- a/nymea-app/ui/components/MeaDialog.qml +++ b/nymea-app/ui/components/MeaDialog.qml @@ -57,7 +57,7 @@ Dialog { anchors.fill: parent z: -1 onPressed: { - print("Dialog: eating mouse press") + print("Dialog: eating mouse press", root.title) mouse.accepted = true } } diff --git a/nymea-app/ui/system/NetworkSettingsPage.qml b/nymea-app/ui/system/NetworkSettingsPage.qml index 535d2527..e2f0e652 100644 --- a/nymea-app/ui/system/NetworkSettingsPage.qml +++ b/nymea-app/ui/system/NetworkSettingsPage.qml @@ -85,11 +85,15 @@ SettingsPageBase { errorMessage = qsTr("The network manager is not available.") break; case "NetworkManagerErrorUnknownError": + errorMessage = qsTr("An unexpected error happened.") break; } + print("network config reply:", status, errorMessage) + var component = Qt.createComponent(Qt.resolvedUrl("../components/ErrorDialog.qml")) var popup = component.createObject(root, {text: errorMessage, errorCode: status}) + popup.open(); } }