Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 08:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 4.3.4

Browse Source
This commit is contained in:
DDuarte
2014-09-29 12:48:34 +01:00
parent aa638d9bc7 35b267e7f7
commit f805d04941
11 changed files with 97 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/worldserver/Main.cpp
View File

@@ -280,7 +280,20 @@ extern int main(int argc, char** argv)
if (cliThread != nullptr)
{
#ifdef _WIN32
CancelSynchronousIo(cliThread->native_handle());
if (!CancelSynchronousIo(cliThread->native_handle()))
{
DWORD errorCode = GetLastError();
LPSTR errorBuffer;
DWORD formatReturnCode = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS,
nullptr, errorCode, 0, (LPTSTR)&errorBuffer, 0, nullptr);
if (!formatReturnCode)
errorBuffer = "Unknown error";
TC_LOG_ERROR("server.worldserver", "Error cancelling I/O of CliThread, error code %u, detail: %s",
errorCode, errorBuffer);
LocalFree(errorBuffer);
}
#endif
cliThread->join();
delete cliThread;