From 44fa68e6da652ce9ed41d7be756452ce82f16528 Mon Sep 17 00:00:00 2001
From: Anonymous275 <36374260+Anonymous-275@users.noreply.github.com>
Date: Tue, 9 Mar 2021 01:46:03 +0200
Subject: [PATCH] Fixed windows build

---
 include/TConsole.h  | 4 ++--
 include/commandline | 2 +-
 src/TNetwork.cpp    | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/include/TConsole.h b/include/TConsole.h
index 86bf0db..4b4da65 100644
--- a/include/TConsole.h
+++ b/include/TConsole.h
@@ -1,7 +1,7 @@
 #pragma once
-
-#include "TLuaFile.h"
+#undef max //fixes windows macro
 #include "commandline/commandline.h"
+#include "TLuaFile.h"
 #include <atomic>
 #include <fstream>
 
diff --git a/include/commandline b/include/commandline
index 412ece7..19184df 160000
--- a/include/commandline
+++ b/include/commandline
@@ -1 +1 @@
-Subproject commit 412ece748dea50766702435db0f0478c5ae7c7ad
+Subproject commit 19184df67e80cecb02de957d922477f7218b7703
diff --git a/src/TNetwork.cpp b/src/TNetwork.cpp
index 81619a0..38b9ec8 100644
--- a/src/TNetwork.cpp
+++ b/src/TNetwork.cpp
@@ -1,9 +1,9 @@
 #include "TNetwork.h"
-
 #include "Client.h"
 #include <CustomAssert.h>
 #include <Http.h>
 #include <cstring>
+#include <array>
 
 TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& ResourceManager)
     : mServer(Server)
@@ -119,8 +119,10 @@ void TNetwork::TCPServerMain() {
         error("Invalid listening socket");
         return;
     }
+
     if (listen(Listener, SOMAXCONN)) {
         error("listener failed " + std::to_string(GetLastError()));
+        //TODO Fix me leak for Listener socket
         return;
     }
     info("Vehicle event network online");
@@ -131,7 +133,7 @@ void TNetwork::TCPServerMain() {
                 warn("Got an invalid client socket on connect! Skipping...");
                 continue;
             }
-            std::thread ID(&TTCPServer::Identify, this, client);
+            std::thread ID(&TNetwork::Identify, this, client);
             ID.detach();
         } catch (const std::exception& e) {
             error("fatal: " + std::string(e.what()));
@@ -163,6 +165,7 @@ void TNetwork::TCPServerMain() {
     }
     if (listen(Listener, SOMAXCONN)) {
         error(("listener failed ") + std::string(strerror(errno)));
+        //TODO fix me leak Listener
         return;
     }
     info(("Vehicle event network online"));