diff options
author | Discover- <amort11@hotmail.com> | 2013-09-23 16:47:47 +0200 |
---|---|---|
committer | Discover- <amort11@hotmail.com> | 2013-09-23 16:47:47 +0200 |
commit | a0db0728f2f48e7ca4156115b03e63d7ff2164c1 (patch) | |
tree | c17b6d0bdc34f0a8297216f21dd7deb5df4eddcc /src/server/game/Globals/ObjectMgr.cpp | |
parent | 9653576cb4cc9449898d6af691c045d68e9361c5 (diff) | |
parent | 4498ac0062d56aa0a0f2b9a21358f12f83c4b1f7 (diff) |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 7f1d231ebd9..2f309c07cce 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -5236,9 +5236,10 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp) uint32 oldMSTime = getMSTime(); time_t curTime = time(NULL); - tm* lt = localtime(&curTime); + tm lt; + ACE_OS::localtime_r(&curTime, <); uint64 basetime(curTime); - TC_LOG_INFO(LOG_FILTER_GENERAL, "Returning mails current time: hour: %d, minute: %d, second: %d ", lt->tm_hour, lt->tm_min, lt->tm_sec); + TC_LOG_INFO(LOG_FILTER_GENERAL, "Returning mails current time: hour: %d, minute: %d, second: %d ", lt.tm_hour, lt.tm_min, lt.tm_sec); // Delete all old mails without item and without body immediately, if starting server if (!serverUp) |