From af7a3bd861598da80095eacfe2eb2b5c88eb3d45 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 16 Jun 2020 18:25:14 +0200 Subject: [PATCH] Show browser error messages to the user when available --- nymea-app/ui/devicepages/DeviceBrowserPage.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nymea-app/ui/devicepages/DeviceBrowserPage.qml b/nymea-app/ui/devicepages/DeviceBrowserPage.qml index 60dcf62b..de0f534f 100644 --- a/nymea-app/ui/devicepages/DeviceBrowserPage.qml +++ b/nymea-app/ui/devicepages/DeviceBrowserPage.qml @@ -76,7 +76,11 @@ Page { if (params.status !== "success") { header.showInfo(params.error, true); } else if (params.params.deviceError !== "DeviceErrorNoError") { - header.showInfo(qsTr("Error: %1").arg(params.params.deviceError), true) + if (params.params.displayMessage.length > 0) { + header.showInfo(qsTr("Error: %1").arg(params.params.displayMessage), true) + } else { + header.showInfo(qsTr("Error: %1").arg(params.params.deviceError), true) + } } } engine.deviceManager.refreshBrowserItems(d.model)