aboutsummaryrefslogtreecommitdiff
path: root/src/game/QueryHandler.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/QueryHandler.cpp
parent76102c1cdd0fc8bb473f9b3fd3965cea5a3794f6 (diff)
parentd9cb0702158fd045285f2c0a904cb31a45a3864a (diff)
Merge
--HG-- branch : trunk
Diffstat (limited to 'src/game/QueryHandler.cpp')
-rw-r--r--src/game/QueryHandler.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp
index c0a9cfd8f87..af2ffbb7272 100644
--- a/src/game/QueryHandler.cpp
+++ b/src/game/QueryHandler.cpp
@@ -77,17 +77,14 @@ void WorldSession::SendNameQueryOpcodeFromDB(uint64 guid)
GUID_LOPART(guid));
}
-void WorldSession::SendNameQueryOpcodeFromDBCallBack(QueryResult *result, uint32 accountId)
+void WorldSession::SendNameQueryOpcodeFromDBCallBack(QueryResult_AutoPtr result, uint32 accountId)
{
if(!result)
return;
WorldSession * session = sWorld.FindSession(accountId);
if(!session)
- {
- delete result;
return;
- }
Field *fields = result->Fetch();
uint32 guid = fields[0].GetUInt32();
@@ -122,7 +119,6 @@ void WorldSession::SendNameQueryOpcodeFromDBCallBack(QueryResult *result, uint32
data << uint8(0); // is not declined
session->SendPacket( &data );
- delete result;
}
void WorldSession::HandleNameQueryOpcode( WorldPacket & recv_data )