From: Kahrl <kahrl@gmx.net>
Date: Thu, 11 Dec 2014 05:52:20 +0000 (+0100)
Subject: Ignore downloaded public serverlist if public_serverlist is false
X-Git-Tag: 0.4.12~177
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ff3cfb746e203ed02160de09b1912b543c5a25f0;p=oweals%2Fminetest.git

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
---

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