Fixed some errors related to menus. (#487)

Source-Python-Dev-Team · Jul 18, 2023 · f3272be · f3272be
1 parent f129713
commit f3272be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/addons/source-python/packages/source-python/menus/queue.py b/addons/source-python/packages/source-python/menus/queue.py
@@ -219,7 +219,7 @@ def _validate_selection(command, index, valid_choices):
     """
     try:
         choice = int(command[1])
-    except ValueError:
+    except (ValueError, IndexError):
         # Catch errors caused by e.g. "menuselect a"
         return (None, None)
 

diff --git a/addons/source-python/packages/source-python/menus/radio.py b/addons/source-python/packages/source-python/menus/radio.py
@@ -108,9 +108,12 @@ def _select(self, player_index, choice_index):
         if choice_index == BUTTON_CLOSE:
             return self._select_close(player_index)
 
-        return super()._select(
-            player_index,
-            self._player_pages[player_index].options[choice_index])
+        try:
+            option = self._player_pages[player_index].options[choice_index]
+        except KeyError:
+            return
+
+        return super()._select(player_index, option)
 
     def _send(self, player_index):
         """Build and sends the menu to the given player via ShowMenu.