Merge pull request #1133 from openmultiplayer/amir/fixes

Some fixes and changes

Author: AmyrAhmady

CMakeLists.txt

@@ -134,7 +134,7 @@ set(BUILD_UNICODE_COMPONENT FALSE CACHE BOOL "Whether to build the Unicode compo
 set(BUILD_LEGACY_COMPONENTS TRUE CACHE BOOL "Whether to build the legacy components")
 set(BUILD_TEST_COMPONENTS FALSE CACHE BOOL "Whether to build the test component")
 set(BUILD_SQLITE_COMPONENT TRUE CACHE BOOL "Whether to build the SQLite component")
-set(BUILD_FIXES_COMPONENT TRUE CACHE BOOL "Whether to build the Fixes component")
+set(BUILD_FIXES_COMPONENT FALSE CACHE BOOL "Whether to build the Fixes component")
 
 if (UNIX)
 	set(BUILD_ABI_CHECK_TOOL TRUE CACHE BOOL "Whether to build the abi-check tool")

Server/Components/CAPI/main.cpp

@@ -69,6 +69,7 @@ class CAPIComponent final : public IComponent
 		COMPONENT_UNLOADED(mgr->textlabels)
 		COMPONENT_UNLOADED(mgr->vehicles)
 		COMPONENT_UNLOADED(mgr->models)
+		COMPONENT_UNLOADED(mgr->npcs)
 	}
 
 	void free() override

Server/Components/Console/console_impl.hpp

@@ -214,10 +214,7 @@ class ConsoleComponent final : public IConsoleComponent, public CoreEventHandler
 		threadData = new ThreadProcData { true, this };
 		cinThread = std::thread(ThreadProc, threadData);
 		nativeThreadHandle = cinThread.native_handle();
-
-#ifndef WIN32
 		cinThread.detach();
-#endif
 	}
 
 	void onReady() override