From 9455bfe6c232a5dab1733bebdb476afd9ea73239 Mon Sep 17 00:00:00 2001
From: Eladash <18193363+elad335@users.noreply.github.com>
Date: Sun, 31 Dec 2023 23:11:02 +0200
Subject: [PATCH] Savestates: Fix g_fxo->init for types which use a pointer

---
 rpcs3/util/fixed_typemap.hpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/rpcs3/util/fixed_typemap.hpp b/rpcs3/util/fixed_typemap.hpp
index 1e4e23e0e7..18ccf84880 100644
--- a/rpcs3/util/fixed_typemap.hpp
+++ b/rpcs3/util/fixed_typemap.hpp
@@ -456,9 +456,22 @@ namespace stx
 			if constexpr ((std::is_same_v<std::remove_cvref_t<Args>, utils::serial> || ...))
 			{
 				ensure(type_info->save);
+
 				serial_breathe_and_tag(std::get<0>(std::tie(args...)), get_name<T, As>(), false);
 			}
 
+			if constexpr ((std::is_same_v<std::remove_cvref_t<Args>, utils::serial*> || ...))
+			{
+				ensure(type_info->save);
+
+				utils::serial* ar = std::get<0>(std::tie(args...));
+
+				if (ar)
+				{
+					serial_breathe_and_tag(*ar, get_name<T, As>(), false);
+				}
+			}
+
 			g_tls_serialize_name = {};
 
 			*m_order++ = obj;