From f12d374956c6227a073fc955c398757f9a7166bd Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Wed, 26 Dec 2018 12:47:32 +0000 Subject: [PATCH] Content store: Fix bugs relating to packages list size --- builtin/mainmenu/dlg_contentstore.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua index 48856f228..6490e67f1 100644 --- a/builtin/mainmenu/dlg_contentstore.lua +++ b/builtin/mainmenu/dlg_contentstore.lua @@ -285,7 +285,7 @@ function store.load() local file = io.open(target, "r") if file then - store.packages_full = core.parse_json(file:read("*all")) + store.packages_full = core.parse_json(file:read("*all")) or {} file:close() for _, package in pairs(store.packages_full) do @@ -385,7 +385,7 @@ function store.get_formspec() end local formspec - if #store.packages > 0 then + if #store.packages_full > 0 then formspec = { "size[12,7;true]", "position[0.5,0.55]", @@ -426,6 +426,12 @@ function store.get_formspec() } end + if #store.packages == 0 then + formspec[#formspec + 1] = "label[4,3;" + formspec[#formspec + 1] = fgettext("No results") + formspec[#formspec + 1] = "]" + end + local start_idx = (cur_page - 1) * num_per_page + 1 for i=start_idx, math.min(#store.packages, start_idx+num_per_page-1) do local package = store.packages[i] @@ -570,7 +576,7 @@ function store.handle_submit(this, fields, tabname, tabdata) end function create_store_dlg(type) - if not store.loaded then + if not store.loaded or #store.packages_full == 0 then store.load() end