From f4af84dc069f5516e15c0aaf716b81bf82791c77 Mon Sep 17 00:00:00 2001
From: Benjamin Sergeant <bsergean@gmail.com>
Date: Sat, 28 Dec 2019 10:16:18 -0800
Subject: [PATCH] (ws cobra to sentry) handle null events for empty queues

---
 docs/CHANGELOG.md                | 4 ++++
 ixwebsocket/IXWebSocketVersion.h | 2 +-
 ws/ws_cobra_to_sentry.cpp        | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 4e7b771b..106c6a57 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All changes to this project will be documented in this file.
 
+## [7.8.5] - 2019-12-28
+
+(ws cobra to sentry) handle null events for empty queues
+
 ## [7.8.4] - 2019-12-27
 
 (ws cobra to sentry) game is picked in a fair manner, so that all games get the same share of sent events
diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h
index ae8d826c..f235fe54 100644
--- a/ixwebsocket/IXWebSocketVersion.h
+++ b/ixwebsocket/IXWebSocketVersion.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define IX_WEBSOCKET_VERSION "7.8.4"
+#define IX_WEBSOCKET_VERSION "7.8.5"
diff --git a/ws/ws_cobra_to_sentry.cpp b/ws/ws_cobra_to_sentry.cpp
index 84e6307e..b1ba4436 100644
--- a/ws/ws_cobra_to_sentry.cpp
+++ b/ws/ws_cobra_to_sentry.cpp
@@ -146,6 +146,11 @@ namespace ix
             {
                 Json::Value msg = queueManager.pop();
 
+                while (msg.isNull())
+                {
+                    msg = queueManager.pop();
+                    if (stop) return;
+                }
                 if (stop) return;
 
                 auto ret = sentryClient.send(msg, verbose);