Fix crash in smartpause #582
Conversation
by adding missing parameter This was missed in 903d407
This broke when the first parameter was None, but the second wasn't (the second parameter wasn't passed at all.) Use *args/**kwargs to make it behave properly in all cases.
| self.context['api']['disable_safeeyes'] = lambda status: utility.execute_main_thread( | ||
| self.disable_safeeyes, status) | ||
| self.context['api']['disable_safeeyes'] = lambda status=None, is_resting=False: utility.execute_main_thread( | ||
| self.disable_safeeyes, status, is_resting) |
There was a problem hiding this comment.
This is the change that fixes the crash - when the lambda is called with the second parameter, python throws an error, as it only takes one parameter.
| def execute_main_thread(target_function, arg1=None, arg2=None): | ||
| def execute_main_thread(target_function, *args, **kwargs): | ||
| """ | ||
| Execute the given function in main thread. | ||
| """ | ||
| if arg1 is not None and arg2 is not None: | ||
| GLib.idle_add(lambda: target_function(arg1, arg2)) | ||
| elif arg1 is not None: | ||
| GLib.idle_add(lambda: target_function(arg1)) | ||
| elif arg2 is not None: | ||
| GLib.idle_add(lambda: target_function(arg2)) | ||
| else: | ||
| GLib.idle_add(target_function) | ||
|
|
||
| GLib.idle_add(lambda: target_function(*args, **kwargs)) |
There was a problem hiding this comment.
This change is technically not necessary to fix the crash - however, the smartpause plugin calls disable_safeeyes(None, True). With the previous code, this would see that arg1 is None - and pass arg2 to the first argument, instead.
This lead to SafeEyes being "manually" disabled, meaning it would not be re-enabled when the system was no longer idle, only when the user clicked "Enable Safe Eyes".
In theory, this could break any caller of execute_main_thread that relied on the older, less intuitive behaviour.
However, disable_safeeyes is the only call that uses the second argument. enable_safeeyes has a second argument, but that is not used anywhere.
|
Thanks @deltragon and @hartwork |
|
@hartwork Safe Eyes 2.1.9 is released with this fix |
|
@slgobinath thank you! 🙏 |
|
Given the large number of PRs and open issues, I am somewhat confused about the state of this - does smart pause work with Wayland in version 2.1.9? |
|
@archisman-panigrahi On GNOME and Sway it works on Wayland, yes. On other compositors (like KDE) not really - it uses xprintidle, which effectively means it sees the system as always idle (unless you're currently interacting with an XWayland app). |
Fixes #580.