From df6717b0f13073554a643dcdee7d41d73a06249c Mon Sep 17 00:00:00 2001 From: Chev Date: Mon, 6 Nov 2023 00:03:08 -0800 Subject: [PATCH] SprayMesh Extended: Fix spray customizer empty spray list edge case --- .../lua/spraymesh/client/cl_spray_list_db.lua | 2 +- .../lua/vgui/dsprayconfiguration.lua | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/addons/spraymesh_extended/lua/spraymesh/client/cl_spray_list_db.lua b/addons/spraymesh_extended/lua/spraymesh/client/cl_spray_list_db.lua index 18d5bb6..22376a8 100644 --- a/addons/spraymesh_extended/lua/spraymesh/client/cl_spray_list_db.lua +++ b/addons/spraymesh_extended/lua/spraymesh/client/cl_spray_list_db.lua @@ -45,5 +45,5 @@ end function spraylist.GetSprays() local queryResults = sql.Query("SELECT url, name FROM spraymesh_extended_spray_list ORDER BY name DESC") - return queryResults + return queryResults or {} end diff --git a/addons/spraymesh_extended/lua/vgui/dsprayconfiguration.lua b/addons/spraymesh_extended/lua/vgui/dsprayconfiguration.lua index 96acd9d..82cd3b6 100644 --- a/addons/spraymesh_extended/lua/vgui/dsprayconfiguration.lua +++ b/addons/spraymesh_extended/lua/vgui/dsprayconfiguration.lua @@ -154,11 +154,14 @@ function PANEL:Init() self.IconLayout:SetSpaceY(sprayLayoutSpace) -- Load saved sprays - for _, savedSprayData in ipairs(spraylist.GetSprays()) do - local url = savedSprayData.url - local name = savedSprayData.name + local savedSprays = spraylist.GetSprays() + if savedSprays and #savedSprays > 0 then + for _, savedSprayData in ipairs(savedSprays) do + local url = savedSprayData.url + local name = savedSprayData.name - self:AddSpray(url, name) + self:AddSpray(url, name) + end end --