Fixed issue #71. Thanks to @Doldol for pointing that out

Author: Ayuto

addons/source-python/packages/source-python/menus/queue.py

@@ -189,15 +189,15 @@ def pop(self, key, default=None):
 # =============================================================================
 # >> FUNCTIONS
 # =============================================================================
-def _validate_selection(player_info, command, valid_choices):
+def _validate_selection(command, index, valid_choices):
     """Validate a selection command.
 
-    @param <player_infor>:
-    A PlayerInfo instance.
-
     @param <command>:
     A Command instance.
 
+    @param <index>:
+    The player index that issued the command.
+
     @param <valid_choices>:
     A list of integers that defines all valid choices
     """
@@ -208,7 +208,7 @@ def _validate_selection(player_info, command, valid_choices):
         return (None, None)
 
     if choice in valid_choices:
-        return (index_from_playerinfo(player_info), choice)
+        return (index, choice)
 
     return (None, None)
 
@@ -242,21 +242,21 @@ def _esc_refresh():
 # >> CLIENT COMMANDS
 # =============================================================================
 @ClientCommand('menuselect')
-def _menuselect_callback(player_info, command):
+def _menuselect_callback(command, index):
     """Forward the selection to the proper user queue."""
     from menus.radio import VALID_CHOICES
 
-    index, choice = _validate_selection(player_info, command, VALID_CHOICES)
+    index, choice = _validate_selection(command, index, VALID_CHOICES)
     if index is not None:
         _radio_queues[index]._select(choice)
 
 
 @ClientCommand(ESC_SELECTION_CMD)
-def _escselect_callback(player_info, command):
+def _escselect_callback(command, index):
     """Forward the selection to the proper user queue."""
     from menus.esc import VALID_CHOICES
 
-    index, choice = _validate_selection(player_info, command, VALID_CHOICES)
+    index, choice = _validate_selection(command, index, VALID_CHOICES)
     if index is not None:
         _esc_queues[index]._select(choice)
 

addons/source-python/packages/source-python/menus/radio.py

@@ -41,9 +41,9 @@
 else:
     BUTTON_BACK = 8
     BUTTON_NEXT = 9
-    BUTTON_CLOSE = 0
+    BUTTON_CLOSE = 10
     MAX_ITEM_COUNT = 7
-    VALID_CHOICES = range(10)
+    VALID_CHOICES = range(1, 11)
 
 
 # =============================================================================