version 0.1.9

[fms.git] / src / main.cpp

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