Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 17:00:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replaced withReadLock with resultWithReadLock in ScriptSignalQtProxy::findConnection

Browse source
This commit is contained in:
ksuprynowicz 2022-08-28 19:08:53 +02:00
parent 5a4cf06134
commit 79e4093f73
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/script-engine/src/qtscript/ScriptObjectQtProxy.cpp
View file

@ -654,8 +654,8 @@ int ScriptSignalQtProxy::discoverMetaCallIdx() {
} }
ScriptSignalQtProxy::ConnectionList::iterator ScriptSignalQtProxy::findConnection(QScriptValue thisObject, QScriptValue callback) { ScriptSignalQtProxy::ConnectionList::iterator ScriptSignalQtProxy::findConnection(QScriptValue thisObject, QScriptValue callback) {
ConnectionList::iterator iter; auto iterOut = resultWithReadLock<ScriptSignalQtProxy::ConnectionList::iterator>([&]{
/* resultWithReadLock<ScriptSignalQtProxy::ConnectionList::iterator>([&]{ ConnectionList::iterator iter;
for (iter = _connections.begin(); iter != _connections.end(); ++iter) { for (iter = _connections.begin(); iter != _connections.end(); ++iter) {
Connection& conn = *iter; Connection& conn = *iter;
if (conn.callback.strictlyEquals(callback) && conn.thisValue.strictlyEquals(thisObject)) { if (conn.callback.strictlyEquals(callback) && conn.thisValue.strictlyEquals(thisObject)) {
@ -663,16 +663,8 @@ ScriptSignalQtProxy::ConnectionList::iterator ScriptSignalQtProxy::findConnectio
} }
} }
return iter; return iter;
});*/
withReadLock([&]{
for (iter = _connections.begin(); iter != _connections.end(); ++iter) {
Connection& conn = *iter;
if (conn.callback.strictlyEquals(callback) && conn.thisValue.strictlyEquals(thisObject)) {
break;
}
}
}); });
return iter; return iterOut;
} }