From 015168f651aa820e8fe47f74f79c0de5aa44f7d0 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Thu, 20 Aug 2020 14:52:27 +0200
Subject: [PATCH] update submodules No longer show log levels in log messages
 from SGCT twice

---
 apps/OpenSpace/ext/sgct         | 2 +-
 apps/OpenSpace/main.cpp         | 1 +
 ext/ghoul                       | 2 +-
 modules/server/servermodule.cpp | 5 +++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index b712e64848..96191ba658 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit b712e6484894d70a60277bdcf719613b217954a7
+Subproject commit 96191ba658700f60eedf7842ecffa851583f8768
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index b4860fdeaf..93708a7cd8 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -1266,6 +1266,7 @@ int main(int argc, char** argv) {
     
     Log::instance().setLogToConsole(false);
     Log::instance().setShowTime(false);
+    Log::instance().setShowLogLevel(false);
     Log::instance().setLogCallback(mainLogCallback);
 
 #ifdef __APPLE__
diff --git a/ext/ghoul b/ext/ghoul
index d073de9ab1..d8aa4871fe 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit d073de9ab1b81b234a5a1cf55fdec36f029fc639
+Subproject commit d8aa4871fe29ac56002b5b3b85f380ecc3255e08
diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp
index 47974dfe50..6d527b60b4 100644
--- a/modules/server/servermodule.cpp
+++ b/modules/server/servermodule.cpp
@@ -204,8 +204,9 @@ void ServerModule::handleConnection(std::shared_ptr<Connection> connection) {
     ZoneScoped
 
     std::string messageString;
+    messageString.reserve(256);
     while (connection->socket()->getMessage(messageString)) {
-        std::lock_guard<std::mutex> lock(_messageQueueMutex);
+        std::lock_guard lock(_messageQueueMutex);
         _messageQueue.push_back({ connection, std::move(messageString) });
     }
 }
@@ -213,7 +214,7 @@ void ServerModule::handleConnection(std::shared_ptr<Connection> connection) {
 void ServerModule::consumeMessages() {
     ZoneScoped
 
-    std::lock_guard<std::mutex> lock(_messageQueueMutex);
+    std::lock_guard lock(_messageQueueMutex);
     while (!_messageQueue.empty()) {
         const Message& m = _messageQueue.front();
         if (std::shared_ptr<Connection> c = m.connection.lock()) {