Fix bad merge in Shell.qml
commit8c8b4ec69cb43a9cbcda0265783ec81ecf3222b7
authorDaniel d'Andrada <daniel.dandrada@canonical.com>
dateThu 7 Apr 2016, 14:29 (11 years ago)
parented11a4a
qml/Shell.qml+1−1
@@ -113,7 +113,7 @@ Item {
113113 }
114114 }
115115 function _onMainAppChanged(appId) {
116− if (tutorial.running && appId != "" && appId != "unity8-dash") {
116+ if (wizard.active && appId != "" && appId != "unity8-dash") {
117117 // If this happens on first boot, we may be in edge
118118 // tutorial or wizard while receiving a call. But a call
119119 // is more important than wizard so just bail out of those.