git.iko.soy/unity8
on xenial help sign in
Don't just skip if we are not connected and dont skip twice if not supported
e364792Marius Gripsgard
qml/Wizard/Pages/78-firmware-update.qml+8−5
compare with xenial
unifiedsplit
@@ -31,7 +31,7 @@ LocalComponents.Page {
31 title: i18n.tr("Firmware Update")
31 title: i18n.tr("Firmware Update")
32 forwardButtonSourceComponent: forwardButton
32 forwardButtonSourceComponent: forwardButton
33
33
34− skip: !SystemImage.supportsFirmwareUpdate() || !online
34+ skip: !SystemImage.supportsFirmwareUpdate()
35
35
36 property bool online: NetworkingStatus.online
36 property bool online: NetworkingStatus.online
37 property bool hasUpdate: false
37 property bool hasUpdate: false
@@ -41,7 +41,7 @@ LocalComponents.Page {
41
41
42 function check() {
42 function check() {
43 if (!SystemImage.supportsFirmwareUpdate())
43 if (!SystemImage.supportsFirmwareUpdate())
44− return pageStack.next();
44+ return;
45 systemUpdatePage.isChecking = true
45 systemUpdatePage.isChecking = true
46 SystemImage.checkForFirmwareUpdate()
46 SystemImage.checkForFirmwareUpdate()
47 }
47 }
@@ -105,7 +105,8 @@ LocalComponents.Page {
105 wrapMode: Text.Wrap
105 wrapMode: Text.Wrap
106 textSize: Label.Medium
106 textSize: Label.Medium
107 text: systemUpdatePage.hasUpdate ? i18n.tr("There is a firmware update available!")
107 text: systemUpdatePage.hasUpdate ? i18n.tr("There is a firmware update available!")
108− : i18n.tr("Firmware is up to date!")
108+ : online ? i18n.tr("Firmware is up to date!")
109+ : i18n.tr("Please connect to the Internet to check for updates.")
109
110
110 }
111 }
111
112
@@ -209,8 +210,10 @@ LocalComponents.Page {
209 visible: systemUpdatePage.isChecking
210 visible: systemUpdatePage.isChecking
210 }
211 }
211
212
213+ Component.onCompleted: {
214+ if (online)
212− Component.onCompleted: systemUpdatePage.check()
215+ systemUpdatePage.check();
213−
216+ }
214 }
217 }
215
218
216 Connections {
219 Connections {