diff options
| author |  Sadie Powell | 2022-01-16 02:13:21 +0000 |
|---|---|---|
| committer | Sadie Powell | 2022-01-16 02:13:21 +0000 |
| commit | 926a043922f85c8fa23d3f6e461ddf1fbebdc377 (patch) | |
| tree | 7167e7791c12b4bb14937ec6a904b4bcf1ff3b81 /src/configreader.cpp | |
| parent | Fix the previous commit on Windows. (diff) | |
| parent | Fix updating connect classes when <connect:{allow, deny}> is set. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/configreader.cpp')
| -rw-r--r-- | src/configreader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp index 1aa71443b..3a388b5a9 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -268,7 +268,7 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) me->Configure(name, tag); - ClassMap::iterator oldMask = oldBlocksByMask.find(std::make_pair(me->name, me->type)); + ClassMap::iterator oldMask = oldBlocksByMask.find(std::make_pair(mask, me->type)); if (oldMask != oldBlocksByMask.end()) { std::shared_ptr<ConnectClass> old = oldMask->second; |