From c1f58d7b6416a34d01b7c5899e9ff4a6f4f7c869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= <jeremie.ngadi@gmail.com>
Date: Thu, 24 Aug 2017 20:15:44 +0200
Subject: [PATCH] Fix nil value bugs

---
 .../es_extended/client/functions.lua          | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/resources/[essential]/es_extended/client/functions.lua b/resources/[essential]/es_extended/client/functions.lua
index 0ef5872f..4d2f4541 100644
--- a/resources/[essential]/es_extended/client/functions.lua
+++ b/resources/[essential]/es_extended/client/functions.lua
@@ -222,8 +222,10 @@ end
 ESX.UI.Menu.CloseAll = function()
 	
 	for i=1, #ESX.UI.Menu.Opened, 1 do
-		ESX.UI.Menu.Opened[i].close()
-		ESX.UI.Menu.Opened[i] = nil
+		if ESX.UI.Menu.Opened[i] ~= nil then
+			ESX.UI.Menu.Opened[i].close()
+			ESX.UI.Menu.Opened[i] = nil
+		end
 	end
 
 end
@@ -231,8 +233,10 @@ end
 ESX.UI.Menu.GetOpened = function(type, namespace, name)
 
 	for i=1, #ESX.UI.Menu.Opened, 1 do
-		if ESX.UI.Menu.Opened[i].type == type and ESX.UI.Menu.Opened[i].namespace == namespace and ESX.UI.Menu.Opened[i].name == name then
-			return ESX.UI.Menu.Opened[i]
+		if ESX.UI.Menu.Opened[i] ~= nil then
+			if ESX.UI.Menu.Opened[i].type == type and ESX.UI.Menu.Opened[i].namespace == namespace and ESX.UI.Menu.Opened[i].name == name then
+				return ESX.UI.Menu.Opened[i]
+			end
 		end
 	end
 
@@ -1215,9 +1219,13 @@ Citizen.CreateThread(function()
 
 		for i=1, #ESX.TimeoutCallbacks, 1 do
 
-			if currTime >= ESX.TimeoutCallbacks[i].time then
-				ESX.TimeoutCallbacks[i].cb()
-				ESX.TimeoutCallbacks[i] = nil
+			if ESX.TimeoutCallbacks[i] ~= nil then
+
+				if currTime >= ESX.TimeoutCallbacks[i].time then
+					ESX.TimeoutCallbacks[i].cb()
+					ESX.TimeoutCallbacks[i] = nil
+				end
+
 			end
 
 		end