From 91092c442def23b801eb96561ae5f65e4cba2967 Mon Sep 17 00:00:00 2001 From: poire-z Date: Tue, 9 Jan 2018 13:28:17 +0100 Subject: [PATCH] Fix negative nb of enabled dictionaries (#3584) Happened when some dictionaries files have been removed, while these were still referenced in the 'dicts_disabled' setting. --- frontend/apps/reader/modules/readerdictionary.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/frontend/apps/reader/modules/readerdictionary.lua b/frontend/apps/reader/modules/readerdictionary.lua index f16536935..e4c6e07b3 100644 --- a/frontend/apps/reader/modules/readerdictionary.lua +++ b/frontend/apps/reader/modules/readerdictionary.lua @@ -304,11 +304,16 @@ end -- @treturn int nb_disabled function ReaderDictionary:getNumberOfDictionaries() local nb_available = #available_ifos + local nb_enabled = 0 local nb_disabled = 0 - for _ in pairs(G_reader_settings:readSetting("dicts_disabled")) do - nb_disabled = nb_disabled + 1 + local dicts_disabled = G_reader_settings:readSetting("dicts_disabled") + for _, ifo in pairs(available_ifos) do + if dicts_disabled[ifo.file] then + nb_disabled = nb_disabled + 1 + else + nb_enabled = nb_enabled + 1 + end end - local nb_enabled = nb_available - nb_disabled return nb_available, nb_enabled, nb_disabled end