From 4d227af9d977c8b18145898af503f2dc1ab31cd4 Mon Sep 17 00:00:00 2001 From: Robert Jelic <36573031+NoryiE@users.noreply.github.com> Date: Tue, 6 Sep 2022 16:21:54 +0200 Subject: [PATCH] fixed removeObject --- Basalt/Frame.lua | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Basalt/Frame.lua b/Basalt/Frame.lua index 532db2f..1ad43a5 100644 --- a/Basalt/Frame.lua +++ b/Basalt/Frame.lua @@ -150,13 +150,23 @@ return function(name, parent, pTerm, basalt) end end - local function removeObject(obj) + local function removeObject(self, obj) for a, b in pairs(objects) do for key, value in pairs(b) do - if (value == obj) then - table.remove(objects[a], key) - removeEvents(object, obj) - return true; + if(type(obj)=="string")then + if (value:getName() == obj) then + table.remove(objects[a], key) + removeEvents(object, value) + self:updateDraw() + return true; + end + else + if (value == obj) then + table.remove(objects[a], key) + removeEvents(object, value) + self:updateDraw() + return true; + end end end end @@ -1116,9 +1126,7 @@ return function(name, parent, pTerm, basalt) return addObject(obj) end; - removeObject = function(self, obj) - return removeObject(obj) - end; + removeObject = removeObject, getObject = function(self, obj) return getObject(obj)