From bfb2745176e3fd0824e008d3efb2b37bce5ae0db Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 26 Sep 2026 16:39:44 -0600 Subject: [PATCH] Do not panic if active_layouts is empty, fixes #550 --- src/greeter.rs | 6 +++++- src/locker.rs | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/greeter.rs b/src/greeter.rs index 59771a2..c19ba9d 100644 --- a/src/greeter.rs +++ b/src/greeter.rs @@ -604,7 +604,11 @@ impl App { widget::container( widget::button::custom( widget::text( - self.common.active_layouts[self.common.current_keyboard_layout].name(), + self.common + .active_layouts + .get(self.common.current_keyboard_layout) + .map(|x| x.name()) + .unwrap_or_default(), ) .ellipsize(Ellipsize::End(EllipsizeHeightLimit::Lines(1))) .height(16) diff --git a/src/locker.rs b/src/locker.rs index 6d913fd..ce1b3d1 100644 --- a/src/locker.rs +++ b/src/locker.rs @@ -421,7 +421,11 @@ impl App { widget::container( widget::button::custom( widget::text( - self.common.active_layouts[self.common.current_keyboard_layout].name(), + self.common + .active_layouts + .get(self.common.current_keyboard_layout) + .map(|x| x.name()) + .unwrap_or_default(), ) .ellipsize(Ellipsize::End(EllipsizeHeightLimit::Lines(1))) .height(16)