storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
Chrys 2019-10-18 00:24:20 +02:00
parent a3acf7d9cc
commit 8bed7ce8e2
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fenrirscreenreader/core/fenrirManager.py
View File

@ -233,6 +233,7 @@ class fenrirManager():
self.shutdownRequest() self.shutdownRequest()
def shutdown(self): def shutdown(self):
self.environment['runtime']['inputManager'].ungrabAllDevices()
self.environment['runtime']['eventManager'].stopMainEventLoop() self.environment['runtime']['eventManager'].stopMainEventLoop()
self.environment['runtime']['outputManager'].presentText(_("Quit Fenrir"), soundIcon='ScreenReaderOff', interrupt=True) self.environment['runtime']['outputManager'].presentText(_("Quit Fenrir"), soundIcon='ScreenReaderOff', interrupt=True)
self.environment['runtime']['eventManager'].cleanEventQueue() self.environment['runtime']['eventManager'].cleanEventQueue()

3
src/fenrirscreenreader/core/inputManager.py
View File

@ -62,7 +62,7 @@ class inputManager():
print(self.env['runtime']['screenManager'].getCurrScreenIgnored()) print(self.env['runtime']['screenManager'].getCurrScreenIgnored())
if self.env['runtime']['screenManager'].getCurrScreenIgnored(): if self.env['runtime']['screenManager'].getCurrScreenIgnored():
while not self.ungrabAllDevices(): while not self.ungrabAllDevices():
time.sleep(0.1) time.sleep(0.2)
self.env['runtime']['debug'].writeDebugOut("retry ungrabAllDevices " ,debug.debugLevel.WARNING) self.env['runtime']['debug'].writeDebugOut("retry ungrabAllDevices " ,debug.debugLevel.WARNING)
print('try ungrabbing') print('try ungrabbing')
self.env['runtime']['debug'].writeDebugOut("All devices ungrabbed" ,debug.debugLevel.INFO) self.env['runtime']['debug'].writeDebugOut("All devices ungrabbed" ,debug.debugLevel.INFO)
@ -74,7 +74,6 @@ class inputManager():
print('try grabbing') print('try grabbing')
print('grabbed') print('grabbed')
self.env['runtime']['debug'].writeDebugOut("All devices grabbed" ,debug.debugLevel.INFO) self.env['runtime']['debug'].writeDebugOut("All devices grabbed" ,debug.debugLevel.INFO)
self.executeDeviceGrab = False self.executeDeviceGrab = False
def sendKeys(self, keyMacro): def sendKeys(self, keyMacro):
for e in keyMacro: for e in keyMacro:

2
src/fenrirscreenreader/core/remoteManager.py
View File

@ -158,8 +158,6 @@ class remoteManager():
self.env['runtime']['settingsManager'].resetSettingArgDict() self.env['runtime']['settingsManager'].resetSettingArgDict()
def setSettings(self, settingsArgs): def setSettings(self, settingsArgs):
self.env['runtime']['settingsManager'].parseSettingArgs(settingsArgs) self.env['runtime']['settingsManager'].parseSettingArgs(settingsArgs)
self.env['runtime']['screenManager'].getCurrScreen()
self.env['runtime']['screenManager'].getSessionInformation()
self.env['runtime']['screenManager'].updateScreenIgnored() self.env['runtime']['screenManager'].updateScreenIgnored()
def handleRemoteIncomming(self, eventData): def handleRemoteIncomming(self, eventData):
if not eventData: if not eventData: