Fix for a build problem in ThreadSafeFunctor::operator bool()

Tracktion · Dec 3, 2024 · 348802f · 348802f
1 parent 2d58413
commit 348802f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/tests/choc_tests.h b/tests/choc_tests.h
@@ -2874,7 +2874,9 @@ inline void testThreading (choc::test::TestProgress& progress)
             choc::threading::ThreadSafeFunctor<std::function<void(int)>> tsf;
 
             int result = 0;
+            CHOC_EXPECT_FALSE (tsf);
             tsf = [&] (int x) { result = x; };
+            CHOC_EXPECT_TRUE (tsf);
             CHOC_EXPECT_TRUE (tsf (2));
             tsf.reset();
             CHOC_EXPECT_FALSE (tsf (3));

diff --git a/threading/choc_ThreadSafeFunctor.h b/threading/choc_ThreadSafeFunctor.h
@@ -139,7 +139,7 @@ template <typename FunctionType>
 ThreadSafeFunctor<FunctionType>::operator bool() const
 {
     std::scoped_lock l (callback->lock);
-    return callback->fn;
+    return callback->fn != nullptr;
 }
 
 template <typename FunctionType>