fix(menu): don't skip close event when menu is closed from other menu

batuufx · Nov 20, 2022 · d144a6c · d144a6c
1 parent becb5fb
commit d144a6c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/lib/menuv/source/menuv.lua b/lib/menuv/source/menuv.lua
@@ -243,7 +243,7 @@ function MenuV:OpenMenu(menu, cb, reopen)
         self.CurrentMenu:DestroyThreads()
     end
 
-    TriggerEvent('soz-core:client:menu:close')
+    TriggerEvent('soz-core:client:menu:close', false)
 
     self.CurrentMenu = menu
     self.CurrentUpdateUUID = menu:On('update', function(m, k, v)
@@ -342,7 +342,7 @@ function MenuV:CloseAll(cb)
     self.CurrentMenu:Trigger('close')
     self.CurrentMenu:DestroyThreads()
 
-    TriggerEvent('soz-core:client:menu:close')
+    TriggerEvent('soz-core:client:menu:close', false)
 
     SEND_NUI_MESSAGE({ action = 'CLOSE_MENU', uuid = uuid })
 

diff --git a/resources/[lib]/menuv/menuv.lua b/resources/[lib]/menuv/menuv.lua
@@ -2274,7 +2274,7 @@ function MenuV:OpenMenu(menu, cb, reopen)
         self.CurrentMenu:DestroyThreads()
     end
 
-    TriggerEvent('soz-core:client:menu:close')
+    TriggerEvent('soz-core:client:menu:close', false)
 
     self.CurrentMenu = menu
     self.CurrentUpdateUUID = menu:On('update', function(m, k, v)
@@ -2373,6 +2373,8 @@ function MenuV:CloseAll(cb)
     self.CurrentMenu:Trigger('close')
     self.CurrentMenu:DestroyThreads()
 
+    TriggerEvent('soz-core:client:menu:close', false)
+
     SEND_NUI_MESSAGE({ action = 'CLOSE_MENU', uuid = uuid })
 
     self.CurrentMenu = nil

diff --git a/resources/[soz]/soz-core/src/client/player/player.wardrobe.ts b/resources/[soz]/soz-core/src/client/player/player.wardrobe.ts
@@ -50,13 +50,12 @@ export class PlayerWardrobe {
         return true;
     }
 
-    @OnEvent(ClientEvent.CORE_CLOSE_MENU)
+    @OnNuiEvent(NuiEvent.MenuClosed)
     public async onCloseMenu() {
         if (this.currentOutfitResolve) {
             this.currentOutfitResolve({ outfit: null, canceled: true });
         }
 
-        this.nuiMenu.closeMenu();
         this.currentOutfitResolve = null;
     }
 }
diff --git a/resources/[soz]/soz-inventory/client/player.lua b/resources/[soz]/soz-inventory/client/player.lua
@@ -8,7 +8,7 @@ RegisterCommand("inventory", function()
     end
 
     exports["menuv"]:SendNUIMessage({action = "KEY_CLOSE_ALL"})
-    TriggerEvent("soz-core:client:menu:close")
+    TriggerEvent("soz-core:client:menu:close", false)
     QBCore.Functions.TriggerCallback("inventory:server:openPlayerInventory", function(inventory)
         if inventory ~= nil then
             SendNUIMessage({