From 41bbe19de19a011e2d98bfa83e2a32ba9c1693d0 Mon Sep 17 00:00:00 2001
From: Robert Jelic <36573031+NoryiE@users.noreply.github.com>
Date: Fri, 26 Aug 2022 19:31:27 +0200
Subject: [PATCH] small quick fix

---
 Basalt/Frame.lua             | 24 +++++++++++++-----------
 Basalt/main.lua              |  1 +
 Basalt/objects/Animation.lua |  9 +++++----
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Basalt/Frame.lua b/Basalt/Frame.lua
index 6ba3875..8a61fe3 100644
--- a/Basalt/Frame.lua
+++ b/Basalt/Frame.lua
@@ -206,20 +206,22 @@ return function(name, parent, pTerm, basalt)
     end
 
     local function removeEvent(self, event, obj)
-        for a, b in pairs(events[event]) do
-            for key, value in pairs(b) do
-                if (value == obj) then
-                    table.remove(events[event][a], key)
-                    if(#events[event][a]<=0)then
-                        events[event][a] = nil
-                        if(self.parent~=nil)then
-                            if(tableCount(events[event])<=0)then
-                                activeEvents[event] = false
-                                self.parent:removeEvent(event, self)
+        if(events[event]~=nil)then
+            for a, b in pairs(events[event]) do
+                for key, value in pairs(b) do
+                    if (value == obj) then
+                        table.remove(events[event][a], key)
+                        if(#events[event][a]<=0)then
+                            events[event][a] = nil
+                            if(self.parent~=nil)then
+                                if(tableCount(events[event])<=0)then
+                                    activeEvents[event] = false
+                                    self.parent:removeEvent(event, self)
+                                end
                             end
                         end
+                        return true;
                     end
-                    return true;
                 end
             end
         end
diff --git a/Basalt/main.lua b/Basalt/main.lua
index baac265..65261b1 100644
--- a/Basalt/main.lua
+++ b/Basalt/main.lua
@@ -2,6 +2,7 @@ local basaltEvent = require("basaltEvent")()
 local Frame = require("Frame")
 local theme = require("theme")
 local utils = require("utils")
+local log = require("basaltLogs")
 local uuid = utils.uuid
 local createText = utils.createText
 
diff --git a/Basalt/objects/Animation.lua b/Basalt/objects/Animation.lua
index 0ea75e4..a6b9cdf 100644
--- a/Basalt/objects/Animation.lua
+++ b/Basalt/objects/Animation.lua
@@ -134,10 +134,11 @@ return function(name)
     
 
     local function predefinedLerp(v1,v2,d,t,get,set,typ,self)
+        local obj = _OBJ
         local x,y 
         local name = ""
-        if(_OBJ.parent~=nil)then name = _OBJ.parent:getName() end
-        name = name.._OBJ:getName()
+        if(obj.parent~=nil)then name = obj.parent:getName() end
+        name = name..obj:getName()
         addAnimationPart(t+0.05, function()
             if(typ~=nil)then
                 if(activeAnimations[typ]==nil)then activeAnimations[typ] = {} end
@@ -146,13 +147,13 @@ return function(name)
                     end
                 activeAnimations[typ][name] = self
             end
-            x,y = get(_OBJ)
+            x,y = get(obj)
         end)
         for n=0.05,d+0.01,0.05 do
             addAnimationPart(t+n, function()
                 local _x = math.floor(lerp.lerp(x, v1, lerp[mode](n / d))+0.5)
                 local _y = math.floor(lerp.lerp(y, v2, lerp[mode](n / d))+0.5)
-                set(_OBJ, _x,_y)
+                set(obj, _x,_y)
                 if(typ~=nil)then
                     if(n>=d-0.01)then
                         if(activeAnimations[typ][name]==self)then