Skip to content

core: correct $LAYOUT replacement #755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Apr 25, 2025
Merged

core: correct $LAYOUT replacement #755

merged 4 commits into from
Apr 25, 2025

Conversation

PaideiaDilemma
Copy link
Collaborator

@geovex I saw your code in #739

I pulled it and guarded g_pSeatManager->m_pXKBKeymap to avoid the crash that motivated #699.
Let me know if the fix still works for you!

Closes #739

geovex and others added 4 commits April 23, 2025 08:40
@geovex
core: remove fake declaration in header
bcc836e
@geovex
widgets: fix layout rendering
2597a94
@geovex
core: remove CSeatManager::getActiveKbLayoutName
8ea3fc4
@PaideiaDilemma
guard against keymap nullptr
88f3f7a 
avoid this crash:
```
#2  <signal handler called>
#3  xkb_keymap_layout_get_name (keymap=0x0, idx=0) at ../libxkbcommon/src/keymap.c:327
#4  0x00005791d0502cef in replaceAllLayout (str="Layout: $LAYOUT") at /usr/include/c++/14.2.1/bits/unique_ptr.h:193
```
@geovex
Copy link
Contributor

geovex commented Apr 24, 2025 •
edited
Loading

It works for me.
I had some problems with excessive logs for configs like $LAYOUT[!] but i'll open separate issue for that (after i check my config).

@PaideiaDilemma PaideiaDilemma merged commit 8280829 into main Apr 25, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

invalid $LAYOUT in label
2 participants
@PaideiaDilemma @geovex