fix: Tablet startup error

tweak: Check for depreciated plugins on client loader as well
Sonoran-Software · Nov 6, 2024 · 8ced9fe · 8ced9fe
1 parent 6237736
commit 8ced9fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/sonorancad/core/client.lua b/sonorancad/core/client.lua
@@ -26,7 +26,7 @@ function getApiMode()
     end
 end
 
-exports('getApiMode', getApiMode())
+exports('getApiMode', getApiMode)
 
 Config.GetPluginConfig = function(pluginName)
     local correctConfig = nil
@@ -41,8 +41,9 @@ Config.GetPluginConfig = function(pluginName)
         end
         return Config.plugins[pluginName]
     else
-        if pluginName == 'yourpluginname' then
-            return {enabled = false, disableReason = 'Template plugin'}
+        if pluginName == 'apicheck' or pluginName == 'livemap' or pluginName ==
+            'smartsigns' then
+            return {enabled = false, disableReason = 'deprecated plugin'}
         end
         correctConfig = LoadResourceFile(GetCurrentResourceName(),
                                          '/configuration/' .. pluginName ..

diff --git a/tablet/cl_main.lua b/tablet/cl_main.lua
@@ -29,7 +29,7 @@ Citizen.CreateThread(function()
 	end
 	local convar = GetConvar("sonorantablet_cadUrl", tabletURL)
 	local comId = convar:match("comid=(%w+)")
-	if comId ~= "" then
+	if comId ~= "" and comId ~= nil then
 		SetModuleUrl("cad", GetConvar("sonorantablet_cadUrl", tabletURL .. 'login?comid='..comId), true)
 	else
 		SetModuleUrl("cad", GetConvar("sonorantablet_cadUrl", tabletURL), false)