From c2b1a3fd42b107ed37a1d0006058ae9d2df4baaf Mon Sep 17 00:00:00 2001
From: Matthew Territo <territo-sci@users.noreply.github.com>
Date: Sat, 7 Jul 2018 08:26:21 -0600
Subject: [PATCH] Pop Message from queue after use to fix reference lifespan

---
 modules/server/servermodule.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp
index 93e1b21057..c792769416 100644
--- a/modules/server/servermodule.cpp
+++ b/modules/server/servermodule.cpp
@@ -140,10 +140,10 @@ void ServerModule::consumeMessages() {
     std::lock_guard<std::mutex> lock(_messageQueueMutex);
     while (!_messageQueue.empty()) {
         const Message& m = _messageQueue.front();
-        _messageQueue.pop_front();
         if (std::shared_ptr<Connection> c = m.connection.lock()) {
             c->handleMessage(m.messageString);
         }
+        _messageQueue.pop_front();
     }
 }