RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rules: defend against problems when determining focus program

This commit is contained in:
Peter F. Patel-Schneider 2022-01-13 12:54:32 -05:00
parent 26aa1ee15f
commit 7442c52c20
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/logitech_receiver/diversion.py
View File

@ -293,7 +293,10 @@ def x11_focus_prog():
if wm_class and pid: if wm_class and pid:
break break
window = window.query_tree().parent window = window.query_tree().parent
name = psutil.Process(pid.value[0]).name() if pid else '' try:
name = psutil.Process(pid.value[0]).name() if pid else ''
except Exception:
name = ''
return (wm_class[0], wm_class[1], name) if wm_class else (name, ) return (wm_class[0], wm_class[1], name) if wm_class else (name, )
@ -323,7 +326,8 @@ class Process(Condition):
def evaluate(self, feature, notification, device, status, last_result): def evaluate(self, feature, notification, device, status, last_result):
if not isinstance(self.process, str): if not isinstance(self.process, str):
return False return False
result = any(bool(s and s.startswith(self.process)) for s in x11_focus_prog()) focus = x11_focus_prog()
result = any(bool(s and s.startswith(self.process)) for s in focus) if focus else None
return result return result
def data(self): def data(self):