RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 06:26:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

IdManager fix

Browse source
This commit is contained in:
Nekotekina 2017-01-26 04:03:03 +03:00 • committed by Ivan
parent 591a6c8671
commit ee173dc3a2
3 changed files with 31 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

29
rpcs3/Emu/IdManager.cpp
View file

@ -64,39 +64,18 @@ id_manager::id_map::pointer idm::allocate_id(std::pair<u32, u32> types, u32 base
return nullptr;
}
id_manager::id_map::pointer idm::find_id(u32 type, u32 id)
{
auto& map = g_map[type];
const auto found = map.find(id);
return found == map.end() ? nullptr : std::addressof(*found);
}
id_manager::id_map::pointer idm::find_id(u32 type, u32 true_type, u32 id)
{
auto& map = g_map[type];
const auto found = map.find(id);
return found == map.end() || found->first.type() != true_type ? nullptr : std::addressof(*found);
}
std::shared_ptr<void> idm::delete_id(u32 type, u32 id)
{
auto& map = g_map[type];
const auto found = map.find(id);
std::shared_ptr<void> result;
if (found != map.end())
if (found != map.end() && (type == true_type || found->first.type() == true_type))
{
result = std::move(found->second);
map.erase(found);
return std::addressof(*found);
}
return result;
return nullptr;
}
std::shared_ptr<void> idm::delete_id(u32 type, u32 true_type, u32 id)
@ -107,7 +86,7 @@ std::shared_ptr<void> idm::delete_id(u32 type, u32 true_type, u32 id)
std::shared_ptr<void> result;
if (found != map.end() && found->first.type() == true_type)
if (found != map.end() && (type == true_type || found->first.type() == true_type))
{
result = std::move(found->second);
map.erase(found);