mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity

[Server] Don't crash when adding a requiredDataFile w/ no checksum twice

Browse source
This commit is contained in:
David Cernat 2019-05-05 17:39:49 +03:00
parent 02e646e838
commit 3805edaf78
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/openmw-mp/Script/Functions/Server.cpp
View file

@ -189,11 +189,17 @@ void ServerFunctions::SetRuleValue(const char *key, double value) noexcept
void ServerFunctions::AddDataFileRequirement(const char *dataFilename, const char *checksumString) noexcept void ServerFunctions::AddDataFileRequirement(const char *dataFilename, const char *checksumString) noexcept
{ {
auto &samples = mwmp::Networking::getPtr()->getSamples(); auto &samples = mwmp::Networking::getPtr()->getSamples();
auto it = std::find_if(samples.begin(), samples.end(), [&dataFilename](mwmp::PacketPreInit::PluginPair &item) { auto it = std::find_if(samples.begin(), samples.end(), [&dataFilename](mwmp::PacketPreInit::PluginPair &item) {
return item.first == dataFilename; return item.first == dataFilename;
}); });
if (it != samples.end()) if (it != samples.end())
it->second.push_back((unsigned) std::stoul(checksumString)); {
// If this is a filename we've added before, ensure our new checksumString for it isn't empty
if (strlen(checksumString) != 0)
it->second.push_back((unsigned)std::stoul(checksumString));
}
else else
{ {
mwmp::PacketPreInit::HashList checksumList; mwmp::PacketPreInit::HashList checksumList;
@ -207,9 +213,10 @@ void ServerFunctions::AddDataFileRequirement(const char *dataFilename, const cha
} }
samples.emplace_back(dataFilename, checksumList); samples.emplace_back(dataFilename, checksumList);
auto mclient = mwmp::Networking::getPtr()->getMasterClient(); auto masterClient = mwmp::Networking::getPtr()->getMasterClient();
if (mclient)
mclient->PushPlugin({dataFilename, checksum}); if (masterClient)
masterClient->PushPlugin({dataFilename, checksum});
} }
} }