Merge remote branch 'origin/terencehill/misc_bugfixes'

diff --git a/qcsrc/menu/xonotic/maplist.c b/qcsrc/menu/xonotic/maplist.c
index 1390ff3b1a1c22abd115612719341a3ac234b0f1..69757126b4c2a83fdd945f8eba0fd1b041544e0c 100644 (file)
--- a/qcsrc/menu/xonotic/maplist.c
+++ b/qcsrc/menu/xonotic/maplist.c
@@ -297,6 +297,8 @@ void MapList_LoadMap(entity btn, entity me)
 float XonoticMapList_keyDown(entity me, float scan, float ascii, float shift)
 {
        string ch, save;
+       if(me.nItems <= 0)
+               return SUPER(XonoticMapList).keyDown(me, scan, ascii, shift);
        if(scan == K_ENTER || scan == K_KP_ENTER)
        {
                // pop up map info screen

diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c
index d1055f0498f75ac6c06132c6c84fb4eed2fee232..e6d7a902d50bc506f60508dcb11c01c0495cac2f 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.c
+++ b/qcsrc/menu/xonotic/serverlist.c
@@ -315,7 +315,7 @@ void XonoticServerList_draw(entity me)
        me.nItems = gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT);
 
        me.connectButton.disabled = ((me.nItems == 0) && (me.ipAddressBox.text == ""));
-       me.infoButton.disabled = ((me.nItems == 0) || !owned);
+       me.infoButton.disabled = me.favoriteButton.disabled = ((me.nItems == 0) || !owned);
 
        found = 0;
        if(me.selectedServer)