From da4bcbf73665a2771c8d94322df2e4c215e74116 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Mon, 5 Sep 2022 00:10:21 -0500 Subject: [PATCH] [Hotfix] Faction associations file naming / lock consistency --- common/shareddb.cpp | 2 +- shared_memory/faction_association.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shareddb.cpp b/common/shareddb.cpp index 46dd7ef1d..a839f1ea1 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -1507,7 +1507,7 @@ bool SharedDatabase::LoadFactionAssociation(const std::string &prefix) try { auto Config = EQEmuConfig::get(); - EQ::IPCMutex mutex("factionassociation"); + EQ::IPCMutex mutex("factionassociations"); mutex.Lock(); std::string file_name = Config->SharedMemDir + prefix + std::string("factionassociation"); faction_associations_mmf = std::unique_ptr(new EQ::MemoryMappedFile(file_name)); diff --git a/shared_memory/faction_association.cpp b/shared_memory/faction_association.cpp index 4db6f23c6..c0ee0a9e9 100644 --- a/shared_memory/faction_association.cpp +++ b/shared_memory/faction_association.cpp @@ -25,7 +25,7 @@ #include "../common/faction.h" void LoadFactionAssociation(SharedDatabase *database, const std::string &prefix) { - EQ::IPCMutex mutex("factionassociation"); + EQ::IPCMutex mutex("factionassociations"); mutex.Lock(); uint32 lists = 0; @@ -35,7 +35,7 @@ void LoadFactionAssociation(SharedDatabase *database, const std::string &prefix) uint32 size = static_cast(EQ::FixedMemoryHashSet::estimated_size(lists, max_list)); auto Config = EQEmuConfig::get(); - std::string file_name = Config->SharedMemDir + prefix + std::string("factionassociation"); + std::string file_name = Config->SharedMemDir + prefix + std::string("factionassociations"); EQ::MemoryMappedFile mmf(file_name, size); mmf.ZeroFile();