aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2015-03-12 21:52:59 +0100
committerjackpoz <giacomopoz@gmail.com>2015-03-12 21:52:59 +0100
commit127577464614ca0ebe0d344b6358a76856eb1eee (patch)
treef29ed9e944f8870dc75f95604835d164f4426085 /src
parent04020e717c1303bb9b175bad63d4ce155c810e88 (diff)
Revert "Core/SupportMgr: Fix static analysis issue"
This reverts commit 04020e717c1303bb9b175bad63d4ce155c810e88. Initializing a std::string with nullptr is not allowed by C++11 standard and trigger runtime exceptions.
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Support/SupportMgr.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/game/Support/SupportMgr.h b/src/server/game/Support/SupportMgr.h
index 4c4ca485a3e..eddb3cebf75 100644
--- a/src/server/game/Support/SupportMgr.h
+++ b/src/server/game/Support/SupportMgr.h
@@ -101,10 +101,9 @@ public:
{
std::string name;
if (!_assignedTo.IsEmpty())
- if (ObjectMgr::GetPlayerNameByGUID(_assignedTo, name))
- return name;
+ ObjectMgr::GetPlayerNameByGUID(_assignedTo, name);
- return nullptr;
+ return name;
}
std::string const& GetComment() { return _comment; }