[Fix] Don't kill thread OnClose

ThymonA · Nov 30, 2020 · f79538c · f79538c
1 parent 44bdf01
commit f79538c
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/app/lua_components/menu.lua b/app/lua_components/menu.lua
@@ -326,17 +326,21 @@ function CreateMenu(info)
             for _, v in pairs(t.Events[event]) do
                 if (type(v) == 'table' and U:Typeof(v.func) == 'function') then
                     CreateThread(function()
-                        local threadId = coroutine.running()
+                        if (event == 'OnClose') then
+                            v.func(t, unpack(args))
+                        else
+                            local threadId = coroutine.running()
 
-                        if (threadId ~= nil) then
-                            insert(t.data.Threads, threadId)
+                            if (threadId ~= nil) then
+                                insert(t.data.Threads, threadId)
 
-                            v.func(t, unpack(args))
+                                v.func(t, unpack(args))
 
-                            for i = 0, #(t.data.Threads or {}), 1 do
-                                if (t.data.Threads[i] == threadId) then
-                                    remove(t.data.Threads, i)
-                                    return
+                                for i = 0, #(t.data.Threads or {}), 1 do
+                                    if (t.data.Threads[i] == threadId) then
+                                        remove(t.data.Threads, i)
+                                        return
+                                    end
                                 end
                             end
                         end