Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 14:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

I like this better

Browse source
This commit is contained in:
David Kelly 2017-02-03 08:52:33 -07:00
parent 93fee0cf83
commit 069c85c7c2
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
libraries/networking/src/NodeList.cpp
View file

@ -827,26 +827,28 @@ void NodeList::ignoreNodeBySessionID(const QUuid& nodeID, bool ignoreEnabled) {
});
if (ignoreEnabled) {
{
QReadLocker ignoredSetLocker{ &_ignoredSetLock }; // read lock for insert
// add this nodeID to our set of ignored IDs
_ignoredNodeIDs.insert(nodeID);
}
{
QReadLocker personalMutedSetLocker{ &_personalMutedSetLock }; // read lock for insert
// add this nodeID to our set of personal muted IDs
_personalMutedNodeIDs.insert(nodeID);
}
// add this nodeID to our set of ignored IDs
_ignoredSetLock.lockForRead();
_ignoredNodeIDs.insert(nodeID);
_ignoredSetLock.unlock();
// add this nodeID to our set of personal muted IDs
_personalMutedSetLock.lockForRead();
_personalMutedNodeIDs.insert(nodeID);
_personalMutedSetLock.unlock();
emit ignoredNode(nodeID, true);
} else {
{
QWriteLocker ignoredSetLocker{ &_ignoredSetLock }; // write lock for unsafe_erase
_ignoredNodeIDs.unsafe_erase(nodeID);
}
{
QWriteLocker personalMutedSetLocker{ &_personalMutedSetLock }; // write lock for unsafe_erase
_personalMutedNodeIDs.unsafe_erase(nodeID);
}
// write lock for unsafe_erase
_ignoredSetLock.lockForWrite();
_ignoredNodeIDs.unsafe_erase(nodeID);
_ignoredSetLock.unlock();
// write lock for unsafe_erase
_personalMutedSetLock.lockForWrite();
_personalMutedNodeIDs.unsafe_erase(nodeID);
_personalMutedSetLock.unlock();
emit ignoredNode(nodeID, false);
}
@ -858,14 +860,13 @@ void NodeList::ignoreNodeBySessionID(const QUuid& nodeID, bool ignoreEnabled) {
void NodeList::removeFromIgnoreMuteSets(const QUuid& nodeID) {
// don't remove yourself, or nobody
if (!nodeID.isNull() && _sessionUUID != nodeID) {
{
QWriteLocker ignoredSetLocker{ &_ignoredSetLock };
_ignoredNodeIDs.unsafe_erase(nodeID);
}
{
QWriteLocker personalMutedSetLocker{ &_personalMutedSetLock };
_personalMutedNodeIDs.unsafe_erase(nodeID);
}
_ignoredSetLock.lockForWrite();
_ignoredNodeIDs.unsafe_erase(nodeID);
_ignoredSetLock.unlock();
_personalMutedSetLock.lockForWrite();
_personalMutedNodeIDs.unsafe_erase(nodeID);
_personalMutedSetLock.unlock();
}
}