From cc9aa233405cf0f3f0994398a812fb1561091fe2 Mon Sep 17 00:00:00 2001 From: bud Date: Mon, 15 Feb 2021 22:09:06 +0100 Subject: [PATCH 1/3] REMOVE: dont add reload on save hook in core:open-user-module, its automatically done in doc:save() --- data/core/commands/core.lua | 6 ------ 1 file changed, 6 deletions(-) diff --git a/data/core/commands/core.lua b/data/core/commands/core.lua index e7bc3190..a3fd948c 100644 --- a/data/core/commands/core.lua +++ b/data/core/commands/core.lua @@ -107,12 +107,6 @@ command.add(nil, { ["core:open-user-module"] = function() local user_module_doc = core.open_doc(USERDIR .. "/init.lua") if not user_module_doc then return end - local doc_save = user_module_doc.save - user_module_doc.save = function(self) - doc_save(self) - core.reload_module("core.style") - core.load_user_directory() - end core.root_view:open_doc(user_module_doc) end, From b9fcb6e5ae6eb08908fdf6f4e765a087346c254a Mon Sep 17 00:00:00 2001 From: bud Date: Mon, 15 Feb 2021 22:09:25 +0100 Subject: [PATCH 2/3] ADD: test in doc:save(), if the file is the user module, automatically reload config --- data/core/commands/doc.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/core/commands/doc.lua b/data/core/commands/doc.lua index e8eae510..d0e0ddde 100644 --- a/data/core/commands/doc.lua +++ b/data/core/commands/doc.lua @@ -67,6 +67,10 @@ end local function save(filename) doc():save(filename) + if doc().filename == (USERDIR .. "/init.lua") then + core.reload_module("core.style") + core.load_user_directory() + end core.log("Saved \"%s\"", doc().filename) end From 63b024cb815ec18855dbc2f852a8a04c6705acc9 Mon Sep 17 00:00:00 2001 From: bud Date: Tue, 16 Feb 2021 19:25:40 +0100 Subject: [PATCH 3/3] FIX: Use PATHSEP instead of hardcoded "/" path separator --- data/core/commands/doc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/core/commands/doc.lua b/data/core/commands/doc.lua index d0e0ddde..3d1cd7b5 100644 --- a/data/core/commands/doc.lua +++ b/data/core/commands/doc.lua @@ -67,7 +67,7 @@ end local function save(filename) doc():save(filename) - if doc().filename == (USERDIR .. "/init.lua") then + if doc().filename == (USERDIR .. PATHSEP .. "init.lua") then core.reload_module("core.style") core.load_user_directory() end