sessionLock: fix misc:allow_session_lock_restore #7511
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It is checked in the `onNewSessionLock` handler, which also respects the `misc:allow_session_lock_restore` option.
vaxerski
approved these changes
Aug 26, 2024
m4r1vs
pushed a commit
to m4r1vs/Hyprland
that referenced
this pull request
Oct 28, 2024
* Revert "sessionLock: fix the check for locking a locked session (hyprwm#6843)" This reverts commit 9ff83f4. * sessionLock: remove early check for session beeing locked It is checked in the `onNewSessionLock` handler, which also respects the `misc:allow_session_lock_restore` option.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your PR, what does it fix/add?
I broke
misc:allow_session_lock_restorewith #6843.The session beeing locked is checked in the
onNewSessionLockhandler, which also respects themisc:allow_session_lock_restoreoption. So i removed the check inCSessionLockProtocol::onLock.Closes #7455
Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
The
misc:allow_session_lock_restoreoption is a bit dangerous when hyprlock is configured with grace is used.For example when a idle deamon lanches hyprlock a second time without
--immediateand then the session can sudently be unlocked via grace.Maybe we should ad a disclaimer to the grace option in the wiki.
Is it ready for merging, or does it need work?
Tested it, seems to behave as expected.
finished