X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cpp;h=3e135a07167787b7d5469790400320f4ac2100be;hb=f208e33c29132aacaec448e74341edea1b925a2a;hp=21244df935ee65112dec62ffc539d2bfce8e1808;hpb=9048d8e482c91960265f29c2b5b3112f2a52f3d8;p=fms.git

diff --git a/src/main.cpp b/src/main.cpp
index 21244df..3e135a0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-#include "../include/identitytestglobal.h"
+#include "../include/global.h"
 #include "../include/commandthread.h"
 
 #include <ctime>
@@ -14,33 +14,35 @@ int main()
 		xmem_disable_print();
 	#endif
 
-	std::vector<ZThread::Thread *> threads;
+	std::vector<PThread::Thread *> threads;
 
 	srand(time(NULL));
 
 	SetupDB();
 	SetupDefaultOptions();
 
+
 	SetupLogFile();
 
 	SetupNetwork();
 
-	LogFile::instance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS startup v"FMS_VERSION);
+	LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS startup v"FMS_VERSION);
+
 
-	
 	StartThreads(threads);
 
 
-	ZThread::Thread commandthread(new CommandThread());
-	commandthread.wait();
+	//ZThread::Thread commandthread(new CommandThread());
+	PThread::Thread commandthread(new CommandThread());
+	commandthread.Join();
 
 
 	ShutdownThreads(threads);
 
 	ShutdownNetwork();
 
-	LogFile::instance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS shutdown");
-	LogFile::instance()->WriteNewLine();
+	LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS shutdown");
+	LogFile::Instance()->WriteNewLine();
 
 	return 0;
 }