From 34b3d5541d1475ec114031da7e54cd15bb28284b Mon Sep 17 00:00:00 2001 From: yparitcher Date: Mon, 21 Sep 2020 20:05:02 -0400 Subject: [PATCH] Gestures/Profiles: make sure dispatcher is initalized even when the menu is not opened. this was causing a crash when the event name was parsed from creoptions --- frontend/dispatcher.lua | 3 ++- plugins/gestures.koplugin/main.lua | 1 + plugins/profiles.koplugin/main.lua | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/dispatcher.lua b/frontend/dispatcher.lua index 437ed44ed..e439807cd 100644 --- a/frontend/dispatcher.lua +++ b/frontend/dispatcher.lua @@ -287,6 +287,7 @@ local dispatcher_menu_order = { add settings from CreOptions / KoptOptions --]]-- function Dispatcher:init() + if Dispatcher.initialized then return end local parseoptions = function(base, i) for y=1,#base[i].options do local option = base[i].options[y] @@ -512,7 +513,7 @@ example usage: Dispatcher.addSubMenu(self, sub_items, self.data, "profile1") --]]-- function Dispatcher:addSubMenu(caller, menu, location, settings) - if not Dispatcher.initialized then Dispatcher:init() end + Dispatcher:init() table.insert(menu, { text = _("Nothing"), separator = true, diff --git a/plugins/gestures.koplugin/main.lua b/plugins/gestures.koplugin/main.lua index c9edfa515..099d0a50e 100644 --- a/plugins/gestures.koplugin/main.lua +++ b/plugins/gestures.koplugin/main.lua @@ -175,6 +175,7 @@ function Gestures:init() end self.ui.menu:registerToMainMenu(self) + Dispatcher:init() self:initGesture() end diff --git a/plugins/profiles.koplugin/main.lua b/plugins/profiles.koplugin/main.lua index 63f033ba7..b4a58af0b 100644 --- a/plugins/profiles.koplugin/main.lua +++ b/plugins/profiles.koplugin/main.lua @@ -19,6 +19,7 @@ local Profiles = WidgetContainer:new{ } function Profiles:init() + Dispatcher:init() self.ui.menu:registerToMainMenu(self) end