Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions vMenu/menus/WeaponLoadouts.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;

using CitizenFX.Core;

Expand Down Expand Up @@ -71,7 +72,18 @@ private Dictionary<string, List<ValidWeapon>> RefreshSavedWeaponsList()

foreach (var save in saves)
{
SavedWeapons.Add(save, JsonConvert.DeserializeObject<List<ValidWeapon>>(GetResourceKvpString(save)));
var kvpValue = GetResourceKvpString(save);
if (!string.IsNullOrEmpty(kvpValue))
{
try
{
SavedWeapons.Add(save, JsonConvert.DeserializeObject<List<ValidWeapon>>(kvpValue));
}
catch (Exception ex)
{
Debug.WriteLine($"[vMenu] Error: Failed to load corrupted saved loadout.\nStacktrace: {ex.StackTrace}\nError message: {ex.Message}\nSaved JSON: {kvpValue}\nSaveName: {save}");
}
}
}

return SavedWeapons;
Expand Down
Loading