diff options
| author | Shauren <shauren.trinity@gmail.com> | 2012-03-11 07:18:38 -0700 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2012-03-11 07:18:38 -0700 |
| commit | 036dae5a36d2041944a74f301b5fae76c7d39b06 (patch) | |
| tree | 485df04144fe6468bcf4c680aad378694d0dfce0 /src | |
| parent | 3cf8b9a15afee5e65b368721a74b4a942c027134 (diff) | |
| parent | 1ddf039de8a67b4b23df854c3d7aac22cb3d56d5 (diff) | |
Merge pull request #5631 from joschiwald/crashfix
Core/CreatureTextMgr: Fix crash in GetLocalizedChatString()
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Texts/CreatureTextMgr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index 1651fae9f4c..2f79eaff06a 100755 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -453,8 +453,7 @@ std::string CreatureTextMgr::GetLocalizedChatString(uint32 entry, uint8 textGrou if (locItr == mLocaleTextMap.end()) return baseText; - if (locItr->second.Text[locale].length()) - return locItr->second.Text[locale]; + ObjectMgr::GetLocaleString(locItr->second.Text, locale, baseText); return baseText; } |