Commit ef6a9c47 authored by Andrey Butirsky's avatar Andrey Butirsky
Browse files

[wayland] fix crash on startup with lv3:ralt_alt XKB option

With lv3:ralt_alt ("Right Alt never chooses 3rd level") option set, we
get more layouts from libxkbcommon than it was configured, see:
https://github.com/xkbcommon/libxkbcommon/issues/262
It might be correct lib's behavior, still.

The extra layouts are redundant, so we strip them out from usual usage.

BUG: 440027


(cherry picked from commit 59143eee)
parent b803a609
......@@ -413,9 +413,9 @@ QString Xkb::layoutName() const
return layoutName(m_currentLayout);
}
const QString &Xkb::layoutShortName(int index) const
QString Xkb::layoutShortName(int index) const
{
return m_layoutList.at(index);
return m_layoutList.value(index);
}
void Xkb::updateConsumedModifiers(uint32_t key)
......
......@@ -89,7 +89,7 @@ public:
}
QString layoutName(xkb_layout_index_t index) const;
QString layoutName() const;
const QString &layoutShortName(int index) const;
QString layoutShortName(int index) const;
quint32 numberOfLayouts() const;
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment