diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-27 12:09:32 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-27 12:09:32 +0200 |
| commit | 55eafa247d91e24bd59a369daa05b05d20334791 (patch) | |
| tree | d9cd3bfe6c7d63860916e8c1fdab28a009a33bb5 /src/server/game/World | |
| parent | 7a93e93c9f2afcef80034399ae6754abd1f77152 (diff) | |
| parent | 6699d969f3114b60109288caebee7b5d7d86b61e (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/authserver/Server/AuthSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
Diffstat (limited to 'src/server/game/World')
| -rw-r--r-- | src/server/game/World/World.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index e5dc9ba1a4c..14591db9eb6 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2778,8 +2778,7 @@ void World::UpdateRealmCharCount(uint32 accountId) { PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_COUNT); stmt->setUInt32(0, accountId); - PreparedQueryResultFuture result = CharacterDatabase.AsyncQuery(stmt); - m_realmCharCallbacks.push_back(std::move(result)); + m_realmCharCallbacks.push_back(CharacterDatabase.AsyncQuery(stmt)); } void World::_UpdateRealmCharCount(PreparedQueryResult resultCharCount) |