summaryrefslogtreecommitdiffstats
path: root/src/settingsui/network/WifiSettings.qml
diff options
context:
space:
mode:
authorVille Voutilainen <ville.voutilainen@qt.io>2018-03-27 17:56:25 +0300
committerVille Voutilainen <ville.voutilainen@qt.io>2018-03-28 11:40:42 +0000
commit518749701642b9d93773b5599e9a64ecbc640b9a (patch)
tree35e8e75f493f1be0e217a25a48216cd070233902 /src/settingsui/network/WifiSettings.qml
parent796fff1debaa161483515779bb68999948d48c59 (diff)
Forward-port the improvement in passphrase error handling
Task-number: QTBUG-66280 Change-Id: I1c26e19907be99119bf9409c7269471c15b57bf8 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/settingsui/network/WifiSettings.qml')
-rw-r--r--src/settingsui/network/WifiSettings.qml6
1 files changed, 6 insertions, 0 deletions
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();
+ }
}
}
}