diff --git a/android/luajit-launcher b/android/luajit-launcher index faf756f04..5bd850e1e 160000 --- a/android/luajit-launcher +++ b/android/luajit-launcher @@ -1 +1 @@ -Subproject commit faf756f04de275994fbcabe2400e4c585cd3f6ae +Subproject commit 5bd850e1e57d4ceb1b867f3bc38a31a8795a9fe9 diff --git a/frontend/apps/reader/pluginloader.lua b/frontend/apps/reader/pluginloader.lua index b53b8cc4d..a06fabc0d 100644 --- a/frontend/apps/reader/pluginloader.lua +++ b/frontend/apps/reader/pluginloader.lua @@ -2,7 +2,7 @@ local DEBUG = require("dbg") -- lfs local PluginLoader = { - plugin_path = lfs.currentdir().."/plugins" + plugin_path = "plugins" } function PluginLoader:loadPlugins() diff --git a/frontend/ui/gesturedetector.lua b/frontend/ui/gesturedetector.lua index 4265796cf..f19c2af10 100644 --- a/frontend/ui/gesturedetector.lua +++ b/frontend/ui/gesturedetector.lua @@ -460,7 +460,7 @@ function GestureDetector:handleTwoFingerPan(tev) -- triggering slot local tslot = tev.slot -- reference slot - local rslot = tslot and 0 or 1 + local rslot = tslot == 1 and 0 or 1 local tpan_dir, tpan_dis = self:getPath(tslot) local tstart_pos = Geom:new{ x = self.first_tevs[tslot].x, diff --git a/frontend/ui/uimanager.lua b/frontend/ui/uimanager.lua index cd5fd409b..931b54bdc 100644 --- a/frontend/ui/uimanager.lua +++ b/frontend/ui/uimanager.lua @@ -116,6 +116,7 @@ end -- transmit an event to registered widgets function UIManager:sendEvent(event) + if #self._window_stack == 0 then return end -- top level widget has first access to the event if self._window_stack[#self._window_stack].widget:handleEvent(event) then return diff --git a/koreader-base b/koreader-base index 0047fa7aa..2b38b16d2 160000 --- a/koreader-base +++ b/koreader-base @@ -1 +1 @@ -Subproject commit 0047fa7aa34f686641abfa3db7e11217d2315137 +Subproject commit 2b38b16d2795a228b1a541fbc2e09bd093119aad