aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-10-24 15:39:32 +0200
committerShauren <shauren.trinity@gmail.com>2015-10-24 15:39:32 +0200
commit783e8299ccc8fc73522940b98c3982979a13bc31 (patch)
treee6ad317c40742827d06ce887ae3adc8fc57d28b6 /src
parent262809b5ad66b43c9e04a845f795d63b1be4b82a (diff)
Core/Misc: Fix for builds linked with libc++ instead of libstdc++
Diffstat (limited to 'src')
-rw-r--r--src/server/bnetserver/Server/Session.cpp1
-rw-r--r--src/server/game/Server/WorldSocket.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/server/bnetserver/Server/Session.cpp b/src/server/bnetserver/Server/Session.cpp
index 36137b20b41..062ee535b23 100644
--- a/src/server/bnetserver/Server/Session.cpp
+++ b/src/server/bnetserver/Server/Session.cpp
@@ -672,6 +672,7 @@ bool Battlenet::Session::Update()
if (_queryFuture.valid() && _queryFuture.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
{
auto callback = std::move(_queryCallback);
+ _queryCallback = nullptr;
callback(_queryFuture.get());
}
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index 7f9b398e50d..6839e5831de 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -130,6 +130,7 @@ bool WorldSocket::Update()
if (_queryFuture.valid() && _queryFuture.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
{
auto callback = std::move(_queryCallback);
+ _queryCallback = nullptr;
callback(_queryFuture.get());
}
}