From 79e4093f7309e4d15f434157cf84e7cb48fd4875 Mon Sep 17 00:00:00 2001
From: ksuprynowicz <ksuprynowicz@post.pl>
Date: Sun, 28 Aug 2022 19:08:53 +0200
Subject: [PATCH] Replaced withReadLock with resultWithReadLock in
 ScriptSignalQtProxy::findConnection

---
 .../src/qtscript/ScriptObjectQtProxy.cpp           | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/libraries/script-engine/src/qtscript/ScriptObjectQtProxy.cpp b/libraries/script-engine/src/qtscript/ScriptObjectQtProxy.cpp
index a4416e9b8c..a9a7e54e19 100644
--- a/libraries/script-engine/src/qtscript/ScriptObjectQtProxy.cpp
+++ b/libraries/script-engine/src/qtscript/ScriptObjectQtProxy.cpp
@@ -654,8 +654,8 @@ int ScriptSignalQtProxy::discoverMetaCallIdx() {
 }
 
 ScriptSignalQtProxy::ConnectionList::iterator ScriptSignalQtProxy::findConnection(QScriptValue thisObject, QScriptValue callback) {
-    ConnectionList::iterator iter;
-/*    resultWithReadLock<ScriptSignalQtProxy::ConnectionList::iterator>([&]{
+    auto iterOut = resultWithReadLock<ScriptSignalQtProxy::ConnectionList::iterator>([&]{
+        ConnectionList::iterator iter;
         for (iter = _connections.begin(); iter != _connections.end(); ++iter) {
             Connection& conn = *iter;
             if (conn.callback.strictlyEquals(callback) && conn.thisValue.strictlyEquals(thisObject)) {
@@ -663,16 +663,8 @@ ScriptSignalQtProxy::ConnectionList::iterator ScriptSignalQtProxy::findConnectio
             }
         }
         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;
 }