From c27e5e05d23aadaa5d23267cd68e3fb8d7b00753 Mon Sep 17 00:00:00 2001 From: aurhat Date: Sat, 22 Aug 2015 01:49:05 +0200 Subject: [PATCH] Fix displaying LAN servers LAN servers should be always visible, when user opens serverbrowser with LAN servers only. And don't allow to switch from there to alternate views, because for searchlan = 2 it doesn't make sense. --- config/menus_multiplayer.cfg | 2 +- source/src/serverbrowser.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg index e73e50aa..d3470248 100644 --- a/config/menus_multiplayer.cfg +++ b/config/menus_multiplayer.cfg @@ -72,7 +72,7 @@ menuinitselection 16 newmenu multiplayer menuitem [Join a server] joinservermenu -menuitem [Join a LAN server] [ searchlan 2; showallservers 0; showmenu server ] +menuitem [Join a LAN server] [ searchlan 2; showallservers 0; showonlyfavourites 0; showmenu server ] menuitem [Custom connect] [ showmenu [Custom connect] ] menuitem [Connect as Admin] [ showmenu [Admin connect] ] menuitem [] -1 diff --git a/source/src/serverbrowser.cpp b/source/src/serverbrowser.cpp index cb0f00df..ea559f3d 100644 --- a/source/src/serverbrowser.cpp +++ b/source/src/serverbrowser.cpp @@ -879,6 +879,7 @@ const char *favcatcheck(serverinfo &si, const char *ckeys, char *autokeys = NULL void serverbrowseralternativeviews(int shiftdirection) { + if(searchlan == 2) return; const char *ckeys = getalias("serverbrowseraltviews"); if(!ckeys) return; const char *sep = " \t\n\r";