From 2de217852381054c25de0f9b03f4919a904a339a Mon Sep 17 00:00:00 2001
From: monsieurgustav <wilhelm.rotbusch@gmail.com>
Date: Mon, 29 Feb 2016 22:19:10 +0100
Subject: [PATCH] bugfix: listener stops randomly (2) detail: -
 _runPendingMessagesTask is assigned after the task has started, then -
 _runPendingMessagesTask.SafeRelease() has no visible effect, then -
 _runPendingMessagesTask is true for ever

---
 OSC/Source/OSC/Private/Receive/OscDispatcher.cpp | 11 +++++++----
 OSC/Source/OSC/Private/Receive/OscDispatcher.h   |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/OSC/Source/OSC/Private/Receive/OscDispatcher.cpp b/OSC/Source/OSC/Private/Receive/OscDispatcher.cpp
index 855e07d..f67a022 100644
--- a/OSC/Source/OSC/Private/Receive/OscDispatcher.cpp
+++ b/OSC/Source/OSC/Private/Receive/OscDispatcher.cpp
@@ -9,7 +9,8 @@ UOscDispatcher::UOscDispatcher()
 : _listening(FIPv4Address(0), 0),
   _socket(nullptr),
   _socketReceiver(nullptr),
-  _pendingMessages(1024)  // arbitrary max message count per frame
+  _pendingMessages(1024),  // arbitrary max message count per frame
+  _taskSpawned(0)
 {
 }
 
@@ -182,9 +183,10 @@ void UOscDispatcher::Callback(const FArrayReaderPtr& data, const FIPv4Endpoint&)
     }
 
     // Set a single callback in the main thread per frame.
-    if(!_pendingMessages.IsEmpty() && !_runPendingMessagesTask)
+    if(!_pendingMessages.IsEmpty() && !FPlatformAtomics::InterlockedCompareExchange(&_taskSpawned, 1, 0))
     {
-        _runPendingMessagesTask = FSimpleDelegateGraphTask::CreateAndDispatchWhenReady(
+        check(_taskSpawned == 1);
+        FSimpleDelegateGraphTask::CreateAndDispatchWhenReady(
             FSimpleDelegateGraphTask::FDelegate::CreateUObject(this, &UOscDispatcher::CallbackMainThread),
             TStatId(),
             nullptr,
@@ -206,7 +208,8 @@ void UOscDispatcher::CallbackMainThread()
     // Release before dequeue.
     // If it was released after dequeue, when a message arrives after the while
     // loop and before the release, it would not be processed.
-    _runPendingMessagesTask.SafeRelease();
+    check(_taskSpawned == 1);
+    FPlatformAtomics::InterlockedCompareExchange(&_taskSpawned, 0, 1);
 
     FScopeLock ScopeLock(&_receiversMutex);
 
diff --git a/OSC/Source/OSC/Private/Receive/OscDispatcher.h b/OSC/Source/OSC/Private/Receive/OscDispatcher.h
index 441433a..7d1edac 100644
--- a/OSC/Source/OSC/Private/Receive/OscDispatcher.h
+++ b/OSC/Source/OSC/Private/Receive/OscDispatcher.h
@@ -50,7 +50,7 @@ private:
     FSocket * _socket;
     FUdpSocketReceiver * _socketReceiver;
     TCircularQueue<std::pair<FName, TArray<FOscDataElemStruct>>> _pendingMessages;
-    FGraphEventRef _runPendingMessagesTask;
+    int32 _taskSpawned;
 
     /// Protects _receivers
     FCriticalSection _receiversMutex;