From e7320c2291ebe0fdb6e67cb427d84645f7495ef6 Mon Sep 17 00:00:00 2001 From: rxi Date: Fri, 22 May 2020 15:43:47 +0100 Subject: [PATCH] Made RootView:open_doc() try to use previous node if current node is locked --- data/core/rootview.lua | 4 ++++ data/plugins/treeview.lua | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/data/core/rootview.lua b/data/core/rootview.lua index d6bf876f..859b41c6 100644 --- a/data/core/rootview.lua +++ b/data/core/rootview.lua @@ -386,6 +386,10 @@ end function RootView:open_doc(doc) local node = self:get_active_node() + if node.locked and core.last_active_view then + core.set_active_view(core.last_active_view) + node = self:get_active_node() + end assert(not node.locked, "Cannot open doc on locked node") for i, view in ipairs(node.views) do if view.doc == doc then diff --git a/data/plugins/treeview.lua b/data/plugins/treeview.lua index d22db0f7..8aa53ffc 100644 --- a/data/plugins/treeview.lua +++ b/data/plugins/treeview.lua @@ -111,7 +111,6 @@ end function TreeView:on_mouse_pressed(button, x, y) - core.set_active_view(core.last_active_view) if not self.hovered_item then return elseif self.hovered_item.type == "dir" then