From 4c4db4c7caae94fc165bc483941194e18452797f Mon Sep 17 00:00:00 2001 From: Nathan C Date: Sun, 1 May 2022 16:47:40 -0400 Subject: [PATCH] fix: tablet errors --- sonorancad/fxmanifest.lua | 2 +- sonorancad/tools/build.ps1 | 6 +++--- sonorancad/version.json | 4 ++-- tablet/html/script.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sonorancad/fxmanifest.lua b/sonorancad/fxmanifest.lua index 84699ba..a0f7496 100644 --- a/sonorancad/fxmanifest.lua +++ b/sonorancad/fxmanifest.lua @@ -3,7 +3,7 @@ games {'gta5'} author 'Sonoran CAD' description 'Sonoran CAD FiveM Integration' -version '2.9.7' +version '2.9.8' server_scripts { 'core/http.js' diff --git a/sonorancad/tools/build.ps1 b/sonorancad/tools/build.ps1 index 324bb54..e537567 100644 --- a/sonorancad/tools/build.ps1 +++ b/sonorancad/tools/build.ps1 @@ -4,13 +4,13 @@ $ReleaseVersion = Read-Host "Enter version to create" -$ResourcePath = $PSScriptRoot + "\[sonorancad]" +$ResourcePath = "G:\git\sonoranplugins\server\resources\[sonorancad]" $WorkPath = $PSScriptRoot + "\release\[sonorancad]" Write-Host $ResourcePath Write-Host $WorkPath -Robocopy.exe $ResourcePath $WorkPath /s /MIR /XD plugins .git .vscode /XF config.json config_*.lua .gitignore config.js config.lua +Robocopy.exe $ResourcePath $WorkPath /s /MIR /XD plugins .git .vscode /XF config.json config_*.lua .gitignore config.js config.lua *.ydr *.ytyp New-Item -ItemType Directory "$WorkPath\sonorancad\plugins" -ErrorAction Ignore Robocopy.exe "$ResourcePath\sonorancad\plugins\template" "$WorkPath\sonorancad\plugins\template" /s @@ -24,4 +24,4 @@ if (-not (Test-Path -Path $7zipPath -PathType Leaf)) { Set-Alias 7zip $7zipPath -7zip a -mx=9 "$PSScriptRoot\sonorancad-$ReleaseVersion.zip" $WorkPath +7zip a -mx=9 "$PSScriptRoot\sonorancad-$ReleaseVersion.zip" $WorkPath \ No newline at end of file diff --git a/sonorancad/version.json b/sonorancad/version.json index 6205cd9..570048f 100644 --- a/sonorancad/version.json +++ b/sonorancad/version.json @@ -1,4 +1,4 @@ { - "resource" : "2.9.7", - "testedFxServerVersion": "5208" + "resource" : "2.9.8", + "testedFxServerVersion": "5511" } diff --git a/tablet/html/script.js b/tablet/html/script.js index 7027b11..99e0a58 100644 --- a/tablet/html/script.js +++ b/tablet/html/script.js @@ -84,7 +84,7 @@ function refreshCall() { $("#callNotes")[0].innerHTML += '' + currentCall.notes[i] + ''; } } - if (currentCall.units.length > 0) { + if (currentCall.units != undefined && currentCall.units.length > 0) { $("#callUnits")[0].innerHTML = ''; for (var i = 0; i