From 8d7cc09586d73836c94aff79049848bec4318c0d Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Sat, 5 Aug 2023 21:07:19 +0200
Subject: [PATCH] Arsenal - Fix unique explosives showing up in the "all
 magazines" tab (#9308)

Check all magazines last
---
 .../functions/fnc_updateUniqueItemsList.sqf    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/arsenal/functions/fnc_updateUniqueItemsList.sqf b/addons/arsenal/functions/fnc_updateUniqueItemsList.sqf
index c7a819af85..4b397ca092 100644
--- a/addons/arsenal/functions/fnc_updateUniqueItemsList.sqf
+++ b/addons/arsenal/functions/fnc_updateUniqueItemsList.sqf
@@ -58,15 +58,6 @@ private _isMiscItem = false;
                 ): {
                     (GVAR(virtualItems) get IDX_VIRT_UNIQUE_MISC_ITEMS) set [_x, nil];
                 };
-                // Primary, Handgun, Secondary weapon magazines
-                case (
-                    !(_x in (GVAR(virtualItems) get IDX_VIRT_ITEMS_ALL)) &&
-                    {_x in (_configItems get IDX_VIRT_ITEMS_ALL) ||
-                    {getNumber (_config >> QGVAR(hide)) == -1} ||
-                    {getNumber (_config >> "type") in [TYPE_MAGAZINE_PRIMARY_AND_THROW, TYPE_MAGAZINE_SECONDARY_AND_PUT, 1536, TYPE_MAGAZINE_HANDGUN_AND_GL, TYPE_MAGAZINE_MISSILE]}}
-                ): {
-                    (GVAR(virtualItems) get IDX_VIRT_UNIQUE_VIRT_ITEMS_ALL) set [_x, nil];
-                };
                 // Grenades
                 case (
                     !(_x in (GVAR(virtualItems) get IDX_VIRT_GRENADES)) &&
@@ -81,6 +72,15 @@ private _isMiscItem = false;
                 ): {
                     (GVAR(virtualItems) get IDX_VIRT_UNIQUE_EXPLOSIVES) set [_x, nil];
                 };
+                // Primary, Handgun, Secondary weapon magazines
+                case (
+                    !(_x in (GVAR(virtualItems) get IDX_VIRT_ITEMS_ALL)) &&
+                    {_x in (_configItems get IDX_VIRT_ITEMS_ALL) ||
+                    {getNumber (_config >> QGVAR(hide)) == -1} ||
+                    {getNumber (_config >> "type") in [TYPE_MAGAZINE_PRIMARY_AND_THROW, TYPE_MAGAZINE_SECONDARY_AND_PUT, 1536, TYPE_MAGAZINE_HANDGUN_AND_GL, TYPE_MAGAZINE_MISSILE]}}
+                ): {
+                    (GVAR(virtualItems) get IDX_VIRT_UNIQUE_VIRT_ITEMS_ALL) set [_x, nil];
+                };
                 // Unknown
                 default {
                     // Don't add items that are part of the arsenal