Menu: don't set focusedItem to values lower than -1

It fixes this subtle bug: QC crash by "dragging" any item in Settings > Game's ListBox (the thing with HUD,
Messages, etc.) above the top of the list (even though it's an immutable list, so dragging should do
nothing other than change the selection).
It was due to XonoticRegisteredSettingsList_focusedItemChangeNotify considering focusedItems < -1
as valid items.
For extra safety I made so that XonoticRegisteredSettingsList_focusedItemChangeNotify considers any
focusedItem < 0 invalid anyway (like XonoticGametypeList_focusedItemChangeNotify).

I also removed a duplicated focusedItemChangeNotify declaration.

diff --git a/qcsrc/menu/item/listbox.qc b/qcsrc/menu/item/listbox.qc
index 021bc95ce9cda1e9e9994fa90c1561a2aae35b72..9b47482f5b154ed08619f0e59baa4ec0f25fd62c 100644 (file)
--- a/qcsrc/menu/item/listbox.qc
+++ b/qcsrc/menu/item/listbox.qc
@@ -251,7 +251,7 @@
        void ListBox_setFocusedItem(entity me, int item)
        {
                float focusedItem_save = me.focusedItem;
-               me.focusedItem = (item < me.nItems) ? item : -1;
+               me.focusedItem = (item >= 0 && item < me.nItems) ? item : -1;
                if (focusedItem_save != me.focusedItem)
                {
                        me.focusedItemChangeNotify(me);

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qc b/qcsrc/menu/xonotic/dialog_settings_game.qc
index b617d4915d4925787c06450c55c343deaade6567..5605f8c8247bd16c2a1a7f0b20ba5bbf561b579e 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qc
@@ -46,7 +46,7 @@ METHOD(XonoticRegisteredSettingsList, drawListBoxItem, void(entity this, int i,
 
 METHOD(XonoticRegisteredSettingsList, focusedItemChangeNotify, void(entity this))
 {
-    if (this.focusedItem == -1 || !this.source)
+    if (this.focusedItem < 0 || !this.source)
     {
         clearTooltip(this);
         return;

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qh b/qcsrc/menu/xonotic/dialog_settings_game.qh
index c0965c23249470b0e686ddbcb68822abecc1b2b1..3a4a36b1d55b0a5a203d7b5b4771a77815710317 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qh
@@ -22,7 +22,6 @@ CLASS(XonoticRegisteredSettingsList, XonoticListBox)
        ATTRIB(XonoticRegisteredSettingsList, source, DataSource);
        ATTRIB(XonoticRegisteredSettingsList, onChange, void(entity, entity));
        ATTRIB(XonoticRegisteredSettingsList, onChangeEntity, entity);
-       METHOD(XonoticRegisteredSettingsList, focusedItemChangeNotify, void(entity));
        METHOD(XonoticRegisteredSettingsList, drawListBoxItem, void(entity this, int i, vector absSize, bool isSelected, bool isFocused));
        METHOD(XonoticRegisteredSettingsList, focusedItemChangeNotify, void(entity this));
        METHOD(XonoticRegisteredSettingsList, refilter, void(entity this));