From a09e4367002912bcc43d518bee9eb0492d28efec Mon Sep 17 00:00:00 2001
From: Grav <75702884+Gravxd@users.noreply.github.com>
Date: Mon, 8 Dec 2025 06:48:40 +0000
Subject: [PATCH 1/3] fix(menus/weaponLoadouts) ensuring broken/corrupted JSON
 doesnt crash the menu building

---
 vMenu/menus/WeaponLoadouts.cs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/vMenu/menus/WeaponLoadouts.cs b/vMenu/menus/WeaponLoadouts.cs
index 0bb088f22..0ead200d1 100644
--- a/vMenu/menus/WeaponLoadouts.cs
+++ b/vMenu/menus/WeaponLoadouts.cs
@@ -71,7 +71,19 @@ 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
+                    {
+                        // Skip corrupted/invalid weapon loadout data
+                        Debug.WriteLine($"[vMenu-crashFix] Warning: Skipping corrupted weapon loadout: {save}");
+                    }
+                }
             }
 
             return SavedWeapons;

From 906f5700101becb99244b68a154878a09ee2b19c Mon Sep 17 00:00:00 2001
From: Tom <31419184+TomGrobbe@users.noreply.github.com>
Date: Sun, 5 Apr 2026 15:00:19 +0200
Subject: [PATCH 2/3] Update WeaponLoadouts.cs

---
 vMenu/menus/WeaponLoadouts.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/vMenu/menus/WeaponLoadouts.cs b/vMenu/menus/WeaponLoadouts.cs
index 0ead200d1..42d8c1c27 100644
--- a/vMenu/menus/WeaponLoadouts.cs
+++ b/vMenu/menus/WeaponLoadouts.cs
@@ -78,10 +78,9 @@ private Dictionary<string, List<ValidWeapon>> RefreshSavedWeaponsList()
                     {
                         SavedWeapons.Add(save, JsonConvert.DeserializeObject<List<ValidWeapon>>(kvpValue));
                     }
-                    catch
+                    catch (Exception ex)
                     {
-                        // Skip corrupted/invalid weapon loadout data
-                        Debug.WriteLine($"[vMenu-crashFix] Warning: Skipping corrupted weapon loadout: {save}");
+                        Debug.WriteLine($"[vMenu] Error: Failed to load corrupted saved loadout.\nStacktrace: {ex.StackTrace}\nError message: {ex.Message}\nSaved JSON: {kvpValue}\nSaveName: {save}");
                     }
                 }
             }

From 4e6f9e8f019d31f4b60bc5de2c3f59f02bc24ede Mon Sep 17 00:00:00 2001
From: Tom <31419184+TomGrobbe@users.noreply.github.com>
Date: Sun, 5 Apr 2026 15:04:08 +0200
Subject: [PATCH 3/3] Update WeaponLoadouts.cs

---
 vMenu/menus/WeaponLoadouts.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vMenu/menus/WeaponLoadouts.cs b/vMenu/menus/WeaponLoadouts.cs
index 42d8c1c27..a0d71421f 100644
--- a/vMenu/menus/WeaponLoadouts.cs
+++ b/vMenu/menus/WeaponLoadouts.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 using CitizenFX.Core;