From f02a55f680ca04f71c881a9e2500cc33a8cbb0e4 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Fri, 23 Sep 2016 09:50:44 +0200 Subject: [PATCH] Update fenrir.py --- src/fenrir-package/fenrir.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/fenrir-package/fenrir.py b/src/fenrir-package/fenrir.py index a2d14486..5fc0c090 100755 --- a/src/fenrir-package/fenrir.py +++ b/src/fenrir-package/fenrir.py @@ -50,12 +50,12 @@ class fenrir(): print(e) self.environment['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR) - if self.environment['screenData']['newApplication'] != self.environment['screenData']['oldApplication']: + if self.environment['runtime']['applicationManager'].isApplicationChange(): self.environment['runtime']['commandManager'].executeDefaultTrigger('onApplicationChange') self.environment['runtime']['commandManager'].executeSwitchTrigger('onSwitchApplicationProfile', \ self.environment['screenData']['oldApplication'], self.environment['screenData']['newApplication']) self.environment['runtime']['commandManager'].executeDefaultTrigger('onInput') - if self.environment['screenData']['newTTY'] == self.environment['screenData']['oldTTY']: + if self.environment['runtime']['screenManager'].isScreenChange(): self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenUpdate') else: self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenChanged') @@ -103,7 +103,10 @@ class fenrir(): if self.environment['runtime']['reviewManager']: self.environment['runtime']['reviewManager'].shutdown() del self.environment['runtime']['reviewManager'] - + if self.environment['runtime']['applicationManager']: + self.environment['runtime']['applicationManager'].shutdown() + del self.environment['runtime']['applicationManager'] + if self.environment['runtime']['debug']: self.environment['runtime']['debug'].shutdown() del self.environment['runtime']['debug']