on xenial help sign in
fix the SIM page not appearing sometimes
8512d50Lukáš Tinkl
qml/Wizard/Pages/10-welcome.qml+3−2
@@ -157,8 +157,9 @@ LocalComponents.Page {
157 i18n.language = plugin.languageCodes[plugin.currentLanguage]; // re-notify of change after above call (for qlocale change)
157 i18n.language = plugin.languageCodes[plugin.currentLanguage]; // re-notify of change after above call (for qlocale change)
158 root.countryCode = plugin.languageCodes[plugin.currentLanguage].split('_')[1].split('.')[0]; // extract the country code, save it for the timezone page
158 root.countryCode = plugin.languageCodes[plugin.currentLanguage].split('_')[1].split('.')[0]; // extract the country code, save it for the timezone page
159
159
160− if (!root.modemManager.available || root.modemManager.modems.length === 0 ||
160+ if (!root.modemManager.available || !root.modemManager.ready || root.modemManager.modems.length === 0 ||
161− root.simManager0.present || root.simManager1.present || root.seenSIMPage) // go to next page
161+ (root.simManager0.present && root.simManager0.ready) || (root.simManager1.present && root.simManager1.ready) ||
162+ root.seenSIMPage) // go to next page
162 pageStack.next();
163 pageStack.next();
163 else
164 else
164 pageStack.load(Qt.resolvedUrl("sim.qml")); // show the SIM page
165 pageStack.load(Qt.resolvedUrl("sim.qml")); // show the SIM page