From 50ba02756baaddee975b996bc32e8e64da5b4114 Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 30 Apr 2017 22:19:31 +0200 Subject: [PATCH] fix other conflicts --- src/fenrir/screenDriver/vcsaDriver.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/fenrir/screenDriver/vcsaDriver.py b/src/fenrir/screenDriver/vcsaDriver.py index 4cc300f6..45f800db 100644 --- a/src/fenrir/screenDriver/vcsaDriver.py +++ b/src/fenrir/screenDriver/vcsaDriver.py @@ -71,7 +71,6 @@ class driver(): obj = bus.get_object('org.freedesktop.login1', '/org/freedesktop/login1') inf = dbus.Interface(obj, 'org.freedesktop.login1.Manager') self.ListSessions = inf.get_dbus_method('ListSessions') - sessions = self.ListSessions() self.env['screen']['autoIgnoreScreens'] = [] for session in sessions: @@ -86,11 +85,11 @@ class driver(): self.env['runtime']['debug'].writeDebugOut('No TTY found for session:' + session[4],debug.debugLevel.ERROR) return if sessionType.upper() == 'X11': - self.env['screenData']['autoIgnoreScreens'].append(screen) - 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['screen']['autoIgnoreScreens'].append(screen) + if screen == self.env['screen']['newTTY'] : + if self.env['general']['currUser'] != session[2]: + self.env['general']['prevUser'] = self.env['general']['currUser'] + self.env['general']['currUser'] = session[2] except Exception as e: self.env['runtime']['debug'].writeDebugOut('getSessionInformation: Maybe no LoginD:' + str(e),debug.debugLevel.ERROR) self.env['screen']['autoIgnoreScreens'] = []