input: fix modifier and leds (#6062)

2 files changed, 11 insertions, 1 deletions

diff --git a/src/devices/IKeyboard.cpp b/src/devices/IKeyboard.cpp
index 3bd42eac..7e4dd912 100644
--- a/src/devices/IKeyboard.cpp
+++ b/src/devices/IKeyboard.cpp
@@ -131,8 +131,17 @@ void IKeyboard::updateLEDs() {
             leds |= (1 << i);
     }
 
+    updateLEDs(leds);
+}
+
+void IKeyboard::updateLEDs(uint32_t leds) {
+    auto keyboard = wlr();
+
+    if (!keyboard || keyboard->xkb_state == nullptr)
+        return;
+
     if (isVirtual() && g_pInputManager->shouldIgnoreVirtualKeyboard(self.lock()))
         return;
 
-    wlr_keyboard_led_update(wlr(), leds);
+    wlr_keyboard_led_update(keyboard, leds);
 }
diff --git a/src/devices/IKeyboard.hpp b/src/devices/IKeyboard.hpp
index d90550da..ec58ff5b 100644
--- a/src/devices/IKeyboard.hpp
+++ b/src/devices/IKeyboard.hpp
@@ -42,6 +42,7 @@ class IKeyboard : public IHID {
     void               updateXKBTranslationState(xkb_keymap* const keymap = nullptr);
     std::string        getActiveLayout();
     void               updateLEDs();
+    void               updateLEDs(uint32_t leds);
 
     bool               active  = false;
     bool               enabled = true;