wayland/lock: abort locks on initial graphics failure - #1175
Open
acrogenesis wants to merge 1 commit into
Open
acrogenesis wants to merge 1 commit into
acrogenesis wants to merge 1 commit into
Conversation
acrogenesis
force-pushed
the
fix/session-lock-initialization-failure
branch
from
September 22, 2026 01:20
223f054 to
4f95e6a
Compare
Cancel the lock attempt when an initial surface cannot initialize graphics. Wait for the compositor's locked event before unlocking, and notify QML when the lock state changes. Stop handling errors after initialization so later failures do not unlock an established session. Ignore failures from an old owner after the lock manager is transferred during reload.
acrogenesis
force-pushed
the
fix/session-lock-initialization-failure
branch
from
September 22, 2026 02:12
4f95e6a to
3ec9256
Compare
acrogenesis
marked this pull request as ready for review
September 22, 2026 07:22
This file contains hidden or 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
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.
Initial lock-surface graphics failures currently abort Quickshell and leave the session locked without an authentication UI. Cancel the lock attempt instead, following the suggestion on #1106.
Wait for the compositor's
lockedevent before sendingunlock_and_destroy, then notify QML thatlockedis false. Handle errors only during initial surface creation; disconnect the handler after initialization and ignore failures after manager ownership transfers during reload. This deliberately unlocks a failed initial attempt without authentication and does not add retries or recovery for later rendering failures.Validation with Qt 6.11.2 and Clang 22:
EGL_BAD_ALLOCinjection and the full installed Omarchy shell viaomarchy-system-lock, under both render loops. Failed initialization clears the lock request; wrong passwords are rejected, correct passwords authenticate through PAM, and subsequent locking succeeds in the same process.popupwindow::moveWithParentfailure remains. Formatting and lint checks for the changed test pass locally; full lint uses CI's pinned toolchain.This is a separate alternative to #1106.