Skip to content

Commit

Permalink
Merge pull request #39 from Jordan2139/master
Browse files Browse the repository at this point in the history
v1.5.7 - Hotfix for incorrect native usage
  • Loading branch information
Fireant456 authored May 29, 2024
2 parents 31c114f + b765d86 commit bbd0a26
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion sonorancms/fxmanifest.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ games {'gta5'}
author 'Sonoran Software Systems'
real_name 'Sonoran CMS FiveM Integration'
description 'Sonoran CMS to FiveM translation layer'
version '1.5.6'
version '1.5.7'
lua54 'yes'

server_scripts {'server/*.lua', 'config.lua', 'server/util/unzip.js', 'server/util/http.js', 'server/util/sonoran.js', 'server/util/utils.js', '@oxmysql/lib/MySQL.lua', 'server/util/imageHandler.js', 'server/modules/**/*_sv.js', 'server/modules/**/*_sv.lua'}
Expand Down
4 changes: 2 additions & 2 deletions sonorancms/server/server.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ SetHttpHandler(function(req, res)
imagePath = GetResourcePath('ps-inventory') .. '/html/' .. path .. '.png'
elseif GetResourceState('ox_inventory') == 'started' then
imagePath = GetResourcePath('ox_inventory') .. '/html/' .. path .. '.png'
elseif GetResourceName('qs-inventory') == 'started' then
elseif GetResourceState('qs-inventory') == 'started' then
imagePath = GetResourcePath('qs-inventory') .. '/html/' .. path .. '.png'
elseif GetResourceState('origen_inventory') == 'started' then
imagePath = GetResourcePath('origen_inventory') .. '/html/' .. path .. '.png'
elseif GetResourceName('core_inventory') == 'started' then
elseif GetResourceState('core_inventory') == 'started' then
imagePath = GetResourcePath('core_inventory') .. '/html/' .. path .. '.png'
end
if not path or not imagePath then
Expand Down
2 changes: 1 addition & 1 deletion sonorancms/version.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"resource": "1.5.6",
"resource": "1.5.7",
"testedFxServerVersion": "7290"
}

0 comments on commit bbd0a26

Please sign in to comment.