Merge remote-tracking branch 'upstream/master' into screen-saver

This commit is contained in:
Zijie He
2016-04-15 13:21:55 -07:00
10 changed files with 47 additions and 47 deletions

View File

@@ -117,7 +117,7 @@ end
-- restore kobo frontlight settings and probe kobo touch coordinates
if Device:isKobo() then
if Device.hasFrontlight then
if Device:hasFrontlight() then
local powerd = Device:getPowerDevice()
if powerd and powerd.restore_settings then
-- UIManager:init() should have sanely set up the frontlight_stuff by this point