on xenial help sign in
Merge
commit7f59c8574c5631466be9f8e70b93fd5e303a394b authorAlbert Astals <albert.astals@canonical.com> dateThu 7 Aug 2014, 10:19 (12 years ago) parentd05adb71d4c112
1 file changed+1−1
qml/Shell.qml+1−1
qml/Shell.qml+1−1
@@ -381,7 +381,7 @@ Item {
381381 onDisplayPowerStateChange: {
382382 // We ignore any display-off signals when the proximity sensor
383383 // is active. This usually indicates something like a phone call.
384− if (status == Powerd.Off && reason != Powerd.Proximity) {
384+ if (status == Powerd.Off && reason != Powerd.Proximity && !edgeDemo.running) {
385385 greeter.showNow();
386386 }
387387