summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKahrl <kahrl@gmx.net>2014-12-11 06:52:20 +0100
committerCraig Robbins <kde.psych@gmail.com>2014-12-30 00:49:23 +1000
commitff3cfb746e203ed02160de09b1912b543c5a25f0 (patch)
treec31096878dd424e0e8157ce8ba1eb62710c1466e
parenta79a116ac8ca0ebdf79bdbbc9e67643334fc6ae6 (diff)
downloadminetest-ff3cfb746e203ed02160de09b1912b543c5a25f0.tar.gz
minetest-ff3cfb746e203ed02160de09b1912b543c5a25f0.tar.bz2
minetest-ff3cfb746e203ed02160de09b1912b543c5a25f0.zip
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
-rw-r--r--builtin/mainmenu/common.lua6
1 files 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