layer-shell: avoid crashes on unmap #7092
Merged
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?
Fixes a crash I had since today, where I would lock my PC, walk away, and come back to a crash in the tty. Turns out the crash is caused if a layer surface is unmapped while hyprland is locked. So if I was receiving notifications, whilst being on the lockscreen, it would crash.
The problem is that the
LastFocus
would contain the session-lock surface, which for some reason doesn't have an associatedhlSurface
, which would however still be accessed and thus segfault. So it seems to be introduced by 963816b, and a null check does the trick.Is there anything you want to mention? (unchecked code, possible bugs, found problems, breaking compatibility, etc.)
Didn't look in too deeply, as I don't have too much time currently, so I don't really know why
hlSurface
is null for the session-lock surface in the first place. But from looking around other code it seems to be expected.Is it ready for merging, or does it need work?
Yes