From 4edb7961470ce536624727b138fa2541e79ebe04 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Tue, 16 May 2023 15:34:32 +0200
Subject: [PATCH] Also set the socket type for the server connection correctly;
  Fix the broken spacetime component again

---
 modules/imgui/src/guispacetimecomponent.cpp |  5 +++--
 modules/server/src/serverinterface.cpp      | 16 ++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index eee574e502..7c00f3d155 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -348,10 +348,11 @@ void GuiSpaceTimeComponent::render() {
                 openspace::TimeUnits.end(),
                 std::string(""),
                 [](const std::string& a, const openspace::TimeUnit& unit) {
-                    return fmt::format("{}{} / second\0", a, nameForTimeUnit(unit, true));
+                    return fmt::format(
+                        "{}{} / second", a, nameForTimeUnit(unit, true)
+                    ) + '\0';
                 }
             );
-
             _firstFrame = false;
         }
 
diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp
index d8b20a7673..88bd9cd3cb 100644
--- a/modules/server/src/serverinterface.cpp
+++ b/modules/server/src/serverinterface.cpp
@@ -177,10 +177,10 @@ ServerInterface::ServerInterface(const ghoul::Dictionary& config)
 
     const std::string type = config.value<std::string>(TypeInfo.identifier);
     if (type == TcpSocketType) {
-        _type = static_cast<int>(InterfaceType::TcpSocket);
+        _socketType = static_cast<int>(InterfaceType::TcpSocket);
     }
     else if (type == WebSocketType) {
-        _type = static_cast<int>(InterfaceType::WebSocket);
+        _socketType = static_cast<int>(InterfaceType::WebSocket);
     }
 
     if (config.hasValue<std::string>(PasswordInfo.identifier)) {
@@ -220,12 +220,12 @@ void ServerInterface::initialize() {
         return;
     }
     switch (static_cast<InterfaceType>(_socketType.value())) {
-    case InterfaceType::TcpSocket:
-        _socketServer = std::make_unique<ghoul::io::TcpSocketServer>();
-        break;
-    case InterfaceType::WebSocket:
-        _socketServer = std::make_unique<ghoul::io::WebSocketServer>();
-        break;
+        case InterfaceType::TcpSocket:
+            _socketServer = std::make_unique<ghoul::io::TcpSocketServer>();
+            break;
+        case InterfaceType::WebSocket:
+            _socketServer = std::make_unique<ghoul::io::WebSocketServer>();
+            break;
     }
     _socketServer->listen(_port);
 }