Merge remote branch 'origin/terencehill/serverlist_fix'

diff --combined qcsrc/menu/xonotic/serverlist.c
index 7251f07fa30bc8b55521f049b38031a23cb39dad,0709d37c56e155e81d6b8a1435c8d504eee35336..4128935795eb24d285b1730f0db8f199936d5792
--- 1/qcsrc/menu/xonotic/serverlist.c
--- 2/qcsrc/menu/xonotic/serverlist.c
+++ b/qcsrc/menu/xonotic/serverlist.c
@@@ -107,6 -107,8 +107,8 @@@ float IsFavorite(string srv
        if(srv == "")
                return FALSE;
        srv = netaddress_resolve(srv, 26000);
+       if(srv == "")
+               return FALSE;
        p = crypto_getidfp(srv);
        n = tokenize_console(cvar_string("net_slist_favorites"));
        for(i = 0; i < n; ++i)
@@@ -502,7 -504,7 +504,7 @@@ void XonoticServerList_resizeNotify(ent
        me.columnPingSize = me.realFontSize_x * 3;
        me.columnMapSize = me.realFontSize_x * 10;
        me.columnTypeSize = me.realFontSize_x * 4;
 -      me.columnPlayersSize = me.realFontSize_x * 4;
 +      me.columnPlayersSize = me.realFontSize_x * 5;
        me.columnNameSize = 1 - me.columnPlayersSize - me.columnMapSize - me.columnPingSize - me.columnIconsSize - me.columnTypeSize - 5 * me.realFontSize_x;
        me.columnPingOrigin = me.columnIconsOrigin + me.columnIconsSize + me.realFontSize_x;
        me.columnNameOrigin = me.columnPingOrigin + me.columnPingSize + me.realFontSize_x;
@@@ -707,8 -709,11 +709,11 @@@ float XonoticServerList_keyDown(entity 
        }
        else if(scan == K_MOUSE2 || scan == K_SPACE)
        {
-               main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
-               DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
+               if(me.nItems != 0)
+               {
+                       main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
+                       DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
+               }
        }
        else if(scan == K_INS || scan == K_MOUSE3 || scan == K_KP_INS)
        {