From 718c0c88456a1b76cfbc41c44871543697b6754c Mon Sep 17 00:00:00 2001
From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com>
Date: Mon, 20 Jul 2020 09:15:58 -0500
Subject: [PATCH] Update ESX Skin (#58)

- Fix breaking nui by pressing keys before loaded
---
 client/main.lua | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/main.lua b/client/main.lua
index 60cf129a..5b589f07 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -1,6 +1,6 @@
 ESX = nil
 local lastSkin, playerLoaded, cam, isCameraActive
-local firstSpawn, zoomOffset, camOffset, heading = true, 0.0, 0.0, 90.0
+local firstSpawn, zoomOffset, camOffset, heading, skinLoaded = true, 0.0, 0.0, 90.0, false
 
 Citizen.CreateThread(function()
     while ESX == nil do
@@ -160,7 +160,7 @@ Citizen.CreateThread(function()
     while true do
         Citizen.Wait(0)
 
-        if isCameraActive then
+        if not skinLoaded or isCameraActive then
             DisableControlAction(2, 30, true)
             DisableControlAction(2, 31, true)
             DisableControlAction(2, 32, true)
@@ -280,6 +280,7 @@ end
 
 AddEventHandler('esx_skin:resetFirstSpawn', function()
     firstSpawn = true
+    skinLoaded = false
 end)
 
 AddEventHandler('esx_skin:playerRegistered', function()
@@ -292,8 +293,12 @@ AddEventHandler('esx_skin:playerRegistered', function()
             ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin)
                 if skin == nil then
                     TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu)
+                    Citizen.Wait(100)
+                    skinLoaded = true
                 else
                     TriggerEvent('skinchanger:loadSkin', skin)
+                    Citizen.Wait(100)
+                    skinLoaded = true
                 end
             end)