From 291e6865d06b81557522b5eee26b28ab20358455 Mon Sep 17 00:00:00 2001 From: chrys Date: Mon, 27 Feb 2017 23:30:43 +0100 Subject: [PATCH] fix static screen ignore --- src/fenrir/core/screenManager.py | 2 +- src/fenrir/screenDriver/vcsaDriver.py | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/fenrir/core/screenManager.py b/src/fenrir/core/screenManager.py index 79452d75..5cff7dba 100644 --- a/src/fenrir/core/screenManager.py +++ b/src/fenrir/core/screenManager.py @@ -39,7 +39,7 @@ class screenManager(): ignoreScreens = [] fixIgnoreScreens = self.env['runtime']['settingsManager'].getSetting('screen', 'suspendingScreen') if fixIgnoreScreens != '': - ignoreScreens.append(fixIgnoreScreens.split(',')) + ignoreScreens.extend(fixIgnoreScreens.split(',')) if self.env['runtime']['settingsManager'].getSettingAsBool('screen', 'autodetectSuspendingScreen'): ignoreScreens.extend(self.env['screenData']['autoIgnoreScreens']) return (screen in ignoreScreens) diff --git a/src/fenrir/screenDriver/vcsaDriver.py b/src/fenrir/screenDriver/vcsaDriver.py index 338896a0..cb432cc8 100644 --- a/src/fenrir/screenDriver/vcsaDriver.py +++ b/src/fenrir/screenDriver/vcsaDriver.py @@ -77,11 +77,9 @@ class driver(): obj = bus.get_object('org.freedesktop.login1', session[4]) inf = dbus.Interface(obj, 'org.freedesktop.DBus.Properties') sessionType = inf.Get('org.freedesktop.login1.Session', 'Type') - screen = str(inf.Get('org.freedesktop.login1.Session', 'VTNr')) - self.env['runtime']['debug'].writeDebugOut('VTNr:' + screen + ' ' +sessionType,debug.debugLevel.ERROR) + screen = str(inf.Get('org.freedesktop.login1.Session', 'VTNr')) if screen == '': - screen = str(inf.Get('org.freedesktop.login1.Session', 'TTY')) - self.env['runtime']['debug'].writeDebugOut('TTY:' + screen + ' ' +sessionType,debug.debugLevel.ERROR) + screen = str(inf.Get('org.freedesktop.login1.Session', 'TTY')) screen = screen[screen.upper().find('TTY') + 3:] if screen == '': self.env['runtime']['debug'].writeDebugOut('No TTY found for session:' + session[4],debug.debugLevel.ERROR) @@ -91,8 +89,7 @@ class driver(): if screen == self.env['screenData']['newTTY'] : if self.env['generalInformation']['currUser'] != session[2]: self.env['generalInformation']['prevUser'] = self.env['generalInformation']['currUser'] - self.env['generalInformation']['currUser'] = session[2] - self.env['runtime']['debug'].writeDebugOut('autoignore:' + str(self.env['screenData']['autoIgnoreScreens']),debug.debugLevel.ERROR) + self.env['generalInformation']['currUser'] = session[2] def update(self, trigger='onUpdate'): newContentBytes = b''