From ff3cfb746e203ed02160de09b1912b543c5a25f0 Mon Sep 17 00:00:00 2001 From: Kahrl Date: Thu, 11 Dec 2014 06:52:20 +0100 Subject: [PATCH] Ignore downloaded public serverlist if public_serverlist is false Fixes #1807: When the server list finishes downloading, the local server list resets in certain conditions --- builtin/mainmenu/common.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin/mainmenu/common.lua b/builtin/mainmenu/common.lua index d2994e19b..384c083d6 100644 --- a/builtin/mainmenu/common.lua +++ b/builtin/mainmenu/common.lua @@ -186,8 +186,10 @@ function asyncOnlineFavourites() end, nil, function(result) - menudata.favorites = result - core.event_handler("Refresh") + if core.setting_getbool("public_serverlist") then + menudata.favorites = result + core.event_handler("Refresh") + end end ) end