fix(client): edge-case errors on restart

overextended · Jun 16, 2023 · 0535686 · 0535686
1 parent 16b955e
commit 0535686
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/modules/bridge/client.lua b/modules/bridge/client.lua
@@ -49,8 +49,12 @@ function client.onLogout()
 
  client.closeInventory()
  Shops.wipeShops()
- ClearInterval(client.interval)
- ClearInterval(client.tick)
+
+ if client.interval then
+ ClearInterval(client.interval)
+ ClearInterval(client.tick)
+ end
+
  Weapon.Disarm()
 end
 

diff --git a/modules/shops/client.lua b/modules/shops/client.lua
@@ -96,7 +96,7 @@ local function wipeShops()
  local shop = shops[i]
 
  if shop.zoneId then
- exports.qtarget:RemoveZone(shop.zoneId)
+ pcall(exports.qtarget.RemoveZone, nil, shop.zoneId)
  end
 
  if shop.remove then