Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Fix mainmenu code downloading the public serverlist twice.
Also, fix a nil error that can happen sometimes in
menu_handle_key_up_down
- Loading branch information
Showing
with
9 additions
and
1 deletion.
-
+9
−1
builtin/mainmenu/common.lua
|
@@ -178,7 +178,7 @@ end |
|
|
|
|
|
-------------------------------------------------------------------------------- |
|
|
function menu_handle_key_up_down(fields, textlist, settingname) |
|
|
local oldidx, newidx = core.get_textlist_index(textlist) |
|
|
local oldidx, newidx = core.get_textlist_index(textlist), 1 |
|
|
if fields.key_up or fields.key_down then |
|
|
if fields.key_up and oldidx and oldidx > 1 then |
|
|
newidx = oldidx - 1 |
|
@@ -203,12 +203,20 @@ function asyncOnlineFavourites() |
|
|
end |
|
|
menudata.favorites = menudata.public_known |
|
|
menudata.favorites_is_public = true |
|
|
|
|
|
if not menudata.public_downloading then |
|
|
menudata.public_downloading = true |
|
|
else |
|
|
return |
|
|
end |
|
|
|
|
|
core.handle_async( |
|
|
function(param) |
|
|
return core.get_favorites("online") |
|
|
end, |
|
|
nil, |
|
|
function(result) |
|
|
menudata.public_downloading = nil |
|
|
local favs = order_favorite_list(result) |
|
|
if favs[1] then |
|
|
menudata.public_known = favs |
|
|