From 461774889be6ddd8f350987aa8182e216c4ef31f Mon Sep 17 00:00:00 2001
From: Henric Backman <b-d-t@msn.com>
Date: Wed, 20 May 2020 00:25:48 +0200
Subject: [PATCH] Update main.lua

characters should now load when client is ready. fix with a little edit from https://github.com/KASHZIN/kashacters/pull/10
---
 esx_kashacters/client/main.lua | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/esx_kashacters/client/main.lua b/esx_kashacters/client/main.lua
index 85bdd9cc..ccdb8b26 100644
--- a/esx_kashacters/client/main.lua
+++ b/esx_kashacters/client/main.lua
@@ -1,8 +1,10 @@
-ESX = nil
+local ESX = nil
+local IsChoosing = true
+
 Citizen.CreateThread(function()
     while ESX == nil do
-        Citizen.Wait(200)
-        TriggerEvent('esx:getSharedObject', function (obj) ESX = obj end)
+        TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
+        Citizen.Wait(0)
     end
 end)
 
@@ -11,17 +13,17 @@ end)
 -- https://forum.fivem.net/t/release-esx-kashacters-multi-character/251613/316?u=xxfri3ndlyxx --
 Citizen.CreateThread(function()
     while true do
-        Citizen.Wait(0)
-        if NetworkIsSessionStarted() then
-            Citizen.Wait(100)
-            TriggerServerEvent("kashactersS:SetupCharacters")
-            TriggerEvent("kashactersC:SetupCharacters")
-            return -- break the loop
+        Citizen.Wait(200)
+        if ESX ~= nil then
+            if NetworkIsSessionStarted() and not ESX.IsPlayerLoaded() then
+                TriggerServerEvent("kashactersS:SetupCharacters")
+                TriggerEvent("kashactersC:SetupCharacters")
+                return -- break the loop
+            end
         end
     end
 end)
 
-local IsChoosing = true
 Citizen.CreateThread(function ()
     while true do
         Citizen.Wait(0)