archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 22:11:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Typemap: Set init to false after each individual destructor

Browse source
This commit is contained in:
Megamouse 2023-12-23 21:32:12 +01:00 • committed by Elad Ashkenazi
parent 69238bfc23
commit 3f5a80d692
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/util/auto_typemap.hpp
View file

@ -135,7 +135,12 @@ namespace stx
// Destroy objects in reverse order
for (; _max; _max--)
{
(*--m_info)->destroy(*--m_order);
auto* info = *--m_info;
const u32 type_index = static_cast<const type_info<typeinfo>*>(info)->index();
info->destroy(*--m_order);
// Set init to false. We don't want other fxo to use this fxo in their destructor.
m_init[type_index] = false;
}
// Pointers should be restored to their positions

7
rpcs3/util/fixed_typemap.hpp
View file

@ -313,7 +313,12 @@ namespace stx
// Destroy objects in reverse order
for (; _max; _max--)
{
(*--m_info)->destroy(*--m_order);
auto* info = *--m_info;
const u32 type_index = static_cast<const type_info<typeinfo>*>(info)->index();
info->destroy(*--m_order);
// Set init to false. We don't want other fxo to use this fxo in their destructor.
m_init[type_index] = false;
}
// Pointers should be restored to their positions