aboutsummaryrefslogtreecommitdiff
path: root/src/game/Channel.cpp
diff options
context:
space:
mode:
authorthenecromancer <none@none>2010-01-23 15:05:33 +0100
committerthenecromancer <none@none>2010-01-23 15:05:33 +0100
commit39ba392c7538db1bd18e617185c28420780e237c (patch)
treea620cd4b809816f697697af9478d6e538eb7cc5d /src/game/Channel.cpp
parent76102c1cdd0fc8bb473f9b3fd3965cea5a3794f6 (diff)
parentd9cb0702158fd045285f2c0a904cb31a45a3864a (diff)
Merge
--HG-- branch : trunk
Diffstat (limited to 'src/game/Channel.cpp')
-rw-r--r--src/game/Channel.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp
index da125b6392b..3b32f29371c 100644
--- a/src/game/Channel.cpp
+++ b/src/game/Channel.cpp
@@ -53,7 +53,7 @@ Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team)
//load not built in channel if saved
std::string _name(name);
CharacterDatabase.escape_string(_name);
- QueryResult *result = CharacterDatabase.PQuery("SELECT m_name, m_team, m_announce, m_moderate, m_password, BannedList FROM channels WHERE m_name = '%s' AND m_team = '%u'", _name.c_str(), m_Team);
+ QueryResult_AutoPtr result = CharacterDatabase.PQuery("SELECT m_name, m_team, m_announce, m_moderate, m_password, BannedList FROM channels WHERE m_name = '%s' AND m_team = '%u'", _name.c_str(), m_Team);
if (result)//load
{
Field *fields = result->Fetch();
@@ -64,8 +64,6 @@ Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team)
m_password = fields[4].GetString();
const char* db_BannedList = fields[5].GetString();
- delete result;
-
m_IsSaved = true;
if (db_BannedList)