Ignore downloaded public serverlist if public_serverlist is false
authorKahrl <kahrl@gmx.net>
Thu, 11 Dec 2014 05:52:20 +0000 (06:52 +0100)
committerCraig Robbins <kde.psych@gmail.com>
Mon, 29 Dec 2014 14:49:23 +0000 (00:49 +1000)
Fixes #1807: When the server list finishes downloading, the local server
list resets in certain conditions

builtin/mainmenu/common.lua

index d2994e19b4c18b3ae74bf864414c236ace4857da..384c083d662c79912623c0273dc0983b83b1d310 100644 (file)
@@ -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