From 5b30ea19205ef6af55b24bd84316eabb66d8a4e6 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Sat, 2 Mar 2019 21:45:12 +0100
Subject: [PATCH] [fix, UX] Common menu & info menu: switch to dofile (#4713)

Require is kept in memory, including the modifications made to it by MenuSorter. This can cause trouble when switching between the FileManager and Reader.

Fixes #4703.
---
 frontend/apps/filemanager/filemanagermenu.lua | 4 ++--
 frontend/apps/reader/modules/readermenu.lua   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/apps/filemanager/filemanagermenu.lua b/frontend/apps/filemanager/filemanagermenu.lua
index d6393b73f..93366dfde 100644
--- a/frontend/apps/filemanager/filemanagermenu.lua
+++ b/frontend/apps/filemanager/filemanagermenu.lua
@@ -158,7 +158,7 @@ function FileManagerMenu:setUpdateItemTable()
         }
     end
     -- insert common settings
-    for id, common_setting in pairs(require("ui/elements/common_settings_menu_table")) do
+    for id, common_setting in pairs(dofile("frontend/ui/elements/common_settings_menu_table.lua")) do
         self.menu_items[id] = common_setting
     end
 
@@ -275,7 +275,7 @@ function FileManagerMenu:setUpdateItemTable()
         end
     }
     -- insert common info
-    for id, common_setting in pairs(require("ui/elements/common_info_menu_table")) do
+    for id, common_setting in pairs(dofile("frontend/ui/elements/common_info_menu_table.lua")) do
         self.menu_items[id] = common_setting
     end
     self.menu_items.exit_menu = {
diff --git a/frontend/apps/reader/modules/readermenu.lua b/frontend/apps/reader/modules/readermenu.lua
index 0d639ba9b..6f6021344 100644
--- a/frontend/apps/reader/modules/readermenu.lua
+++ b/frontend/apps/reader/modules/readermenu.lua
@@ -132,7 +132,7 @@ function ReaderMenu:setUpdateItemTable()
 
     -- settings tab
     -- insert common settings
-    for id, common_setting in pairs(require("ui/elements/common_settings_menu_table")) do
+    for id, common_setting in pairs(dofile("frontend/ui/elements/common_settings_menu_table.lua")) do
         self.menu_items[id] = common_setting
     end
     -- insert DjVu render mode submenu just before the last entry (show advanced)
@@ -176,7 +176,7 @@ function ReaderMenu:setUpdateItemTable()
     }
     -- main menu tab
     -- insert common info
-    for id, common_setting in pairs(require("ui/elements/common_info_menu_table")) do
+    for id, common_setting in pairs(dofile("frontend/ui/elements/common_info_menu_table.lua")) do
         self.menu_items[id] = common_setting
     end