Check all unchecked return values and guard error pathsHEADmaster

2 files changed, 9 insertions, 6 deletions

diff --git a/demo/ConnectionPage.qml b/demo/ConnectionPage.qml
index ba41246..dda77e1 100644
--- a/demo/ConnectionPage.qml
+++ b/demo/ConnectionPage.qml
@@ -35,8 +35,8 @@ Page {
         nameFilters: ["DER certificates (*.der)", "All files (*)"]
         title: "Select Certificate"
 
-        onAccepted: certFileField.text = selectedFile.toString().replace(
-                        "file://", "")
+        onAccepted: certFileField.text = decodeURIComponent(
+                        selectedFile.toString().replace("file://", ""))
     }
 
     FileDialog {
@@ -46,8 +46,9 @@ Page {
         nameFilters: ["Key files (*.pem *.crt)", "All files (*)"]
         title: "Select Private Key"
 
-        onAccepted: keyFileField.text = selectedFile.toString().replace(
-                        "file://", "")
+        onAccepted: keyFileField.text = decodeURIComponent(selectedFile.toString(
+                                                               ).replace(
+                                                               "file://", ""))
     }
 
     FolderDialog {
@@ -56,8 +57,8 @@ Page {
         currentFolder: "file://" + trustFolderField.text
         title: "Select Trust Folder"
 
-        onAccepted: trustFolderField.text = selectedFolder.toString().replace(
-                        "file://", "")
+        onAccepted: trustFolderField.text = decodeURIComponent(
+                        selectedFolder.toString().replace("file://", ""))
     }
 
     ColumnLayout {
diff --git a/demo/Main.qml b/demo/Main.qml
index f0f3674..02bc31e 100644
--- a/demo/Main.qml
+++ b/demo/Main.qml
@@ -38,6 +38,8 @@ ApplicationWindow {
         function onConnectionError(message) {
             debugConsole.appendLog("Connection error: " + message);
             connectionPage.autoConnectFailed = true;
+            certTrustDialog.close();
+            keyPasswordDialog.close();
         }
 
         function onDiscoveringChanged() {