From 518749701642b9d93773b5599e9a64ecbc640b9a Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@qt.io>
Date: Tue, 27 Mar 2018 17:56:25 +0300
Subject: Forward-port the improvement in passphrase error handling

Task-number: QTBUG-66280
Change-Id: I1c26e19907be99119bf9409c7269471c15b57bf8
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
---
 src/settingsui/network/WifiSettings.qml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/settingsui/network/WifiSettings.qml')

diff --git a/src/settingsui/network/WifiSettings.qml b/src/settingsui/network/WifiSettings.qml
index b7779bd..8bb8ee2 100644
--- a/src/settingsui/network/WifiSettings.qml
+++ b/src/settingsui/network/WifiSettings.qml
@@ -197,6 +197,9 @@ Item {
                                 onClicked: {
                                     connectView.visible = false
                                     NetworkSettingsManager.userAgent.setPassphrase(passphrase.text)
+                                    if (networkSelection.currentIndex != -1) {
+                                        NetworkSettingsManager.services.itemFromRow(networkSelection.currentIndex).connectService();
+                                    }
                                 }
                             }
                             Button {
@@ -238,6 +241,9 @@ Item {
                     errorView.visible = true
                     connectView.visible = true
                     root.connecting = false
+                    if (networkSelection.currentIndex != -1) {
+                        NetworkSettingsManager.services.itemFromRow(networkSelection.currentIndex).removeService();
+                    }
                 }
             }
         }
-- 
cgit v1.2.3