Skip to content
Snippets Groups Projects
Commit 05f4e9ee authored by HybridDog's avatar HybridDog Committed by est31
Browse files

More reliable serverlist behaviour

-> remember the previously loaded serverlist, and use if new one failed
-> show a "loading" serverlist
parent e4817454
No related branches found
No related tags found
No related merge requests found
...@@ -234,7 +234,13 @@ end ...@@ -234,7 +234,13 @@ end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
function asyncOnlineFavourites() function asyncOnlineFavourites()
menudata.favorites = {} if not menudata.public_known then
menudata.public_known = {{
name = fgettext("Loading..."),
description = fgettext("Try reenabling public serverlist and check your internet connection.")
}}
end
menudata.favorites = menudata.public_known
core.handle_async( core.handle_async(
function(param) function(param)
return core.get_favorites("online") return core.get_favorites("online")
...@@ -242,11 +248,15 @@ function asyncOnlineFavourites() ...@@ -242,11 +248,15 @@ function asyncOnlineFavourites()
nil, nil,
function(result) function(result)
if core.setting_getbool("public_serverlist") then if core.setting_getbool("public_serverlist") then
menudata.favorites = order_favorite_list(result) local favs = order_favorite_list(result)
if favs[1] then
menudata.public_known = favs
menudata.favorites = menudata.public_known
end
core.event_handler("Refresh") core.event_handler("Refresh")
end end
end end
) )
end end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment