diff --git a/src/TLuaEngine.cpp b/src/TLuaEngine.cpp index e4c2d47..19df10b 100644 --- a/src/TLuaEngine.cpp +++ b/src/TLuaEngine.cpp @@ -43,7 +43,7 @@ void TLuaEngine::operator()() { auto Futures = TriggerEvent("onInit"); WaitForAll(Futures); for (const auto& Future : Futures) { - if (Future->Error) { + if (Future->Error && Future->ErrorMessage != BeamMPFnNotFoundError) { beammp_lua_error("Calling \"onInit\" on \"" + Future->StateId + "\" failed: " + Future->ErrorMessage); } } diff --git a/src/TNetwork.cpp b/src/TNetwork.cpp index c01b287..31c46ae 100644 --- a/src/TNetwork.cpp +++ b/src/TNetwork.cpp @@ -114,7 +114,11 @@ void TNetwork::TCPServerMain() { TConnection client {}; SOCKET Listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); int optval = 1; +#ifdef WIN32 + setsockopt(Listener, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast(&optval), sizeof(optval)); +#else setsockopt(Listener, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast(&optval), sizeof(optval)); +#endif // TODO: check optval or return value idk sockaddr_in addr {}; addr.sin_addr.s_addr = INADDR_ANY;