X-Git-Url: https://git.pterodactylus.net/?p=fms.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=3e135a07167787b7d5469790400320f4ac2100be;hp=069cb908218a1b09a9406a9f5ee1f72e9a0300c0;hb=c7fcb4c4bc5012a584add81a9509fc1f84c3c688;hpb=964f55fd550fc711c0320ce6a24ad713040695d0

diff --git a/src/main.cpp b/src/main.cpp
index 069cb90..3e135a0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,7 +14,7 @@ int main()
 		xmem_disable_print();
 	#endif
 
-	std::vector<ZThread::Thread *> threads;
+	std::vector<PThread::Thread *> threads;
 
 	srand(time(NULL));
 
@@ -26,22 +26,23 @@ int main()
 
 	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;
 }