Merge branch 'main' into macro_reset

# Conflicts: # inputremapper/gui/controller.py
sezanzeb · Dec 28, 2024 · fe217a4 · fe217a4
2 parents 511e61d + b4852f1
commit fe217a4
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/inputremapper/gui/controller.py b/inputremapper/gui/controller.py
@@ -683,6 +683,7 @@ def show_injector_result(self, msg: InjectorStateMessage) -> None:
         state = msg.state
 
         def running() -> None:
+            assert self.data_manager.active_preset is not None
             msg = _('Applied preset "%s"') % self.data_manager.active_preset.name
             if self.data_manager.active_preset.dangerously_mapped_btn_left():
                 msg += _(", CTRL + DEL to stop")
@@ -692,6 +693,7 @@ def running() -> None:
             )
 
         def no_grab() -> None:
+            assert self.data_manager.active_preset is not None
             msg = (
                 _('Failed to apply preset "%s"') % self.data_manager.active_preset.name
             )