Merge pull request #1203 from TanF12/fix-linux-nohup-shutdown

Fix Linux server deadlock on shutdown without TTY

Author: AmyrAhmady

Server/Components/Console/console_impl.hpp

@@ -56,6 +56,7 @@ class ConsoleComponent final : public IConsoleComponent, public CoreEventHandler
 	{
 		std::atomic_bool valid;
 		ConsoleComponent* component;
+		std::atomic_bool isRunning;
 	};
 
 	ICore* core = nullptr;
@@ -211,7 +212,7 @@ class ConsoleComponent final : public IConsoleComponent, public CoreEventHandler
 
 		NetCode::Packet::PlayerRconCommand::addEventHandler(*core, &playerRconCommandHandler);
 
-		threadData = new ThreadProcData { true, this };
+		threadData = new ThreadProcData { true, this, true };
 		cinThread = std::thread(ThreadProc, threadData);
 		nativeThreadHandle = cinThread.native_handle();
 		cinThread.detach();
@@ -249,6 +250,7 @@ class ConsoleComponent final : public IConsoleComponent, public CoreEventHandler
 			}
 			else
 			{
+				threadData->isRunning = false;
 				return;
 			}
 		}
@@ -266,7 +268,10 @@ class ConsoleComponent final : public IConsoleComponent, public CoreEventHandler
 				cinThread.join();
 			}
 #else
-			pthread_cancel(nativeThreadHandle);
+			if (threadData->isRunning)
+			{
+				pthread_cancel(nativeThreadHandle);
+			}
 #endif
 
 			delete threadData;

Server/Components/Pawn/Plugin/Plugin.cpp

@@ -7,6 +7,7 @@
  */
 
 #include "Plugin.h"
+#include <cstdarg>
 #include "../Manager/Manager.hpp"
 
 #ifdef WIN32