summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorworktycho <work.tycho@gmail.com>2016-01-17 20:42:05 +0100
committerworktycho <work.tycho@gmail.com>2016-01-17 20:42:05 +0100
commit7ca191baf6bccf7e631cfe937d7a3d56af4e5280 (patch)
tree02fbb0b9a7e9299f837196b191f244f75ab43fc0 /src
parentMerge pull request #2887 from LogicParrot/water (diff)
parentFixed race conditions (diff)
downloadcuberite-7ca191baf6bccf7e631cfe937d7a3d56af4e5280.tar
cuberite-7ca191baf6bccf7e631cfe937d7a3d56af4e5280.tar.gz
cuberite-7ca191baf6bccf7e631cfe937d7a3d56af4e5280.tar.bz2
cuberite-7ca191baf6bccf7e631cfe937d7a3d56af4e5280.tar.lz
cuberite-7ca191baf6bccf7e631cfe937d7a3d56af4e5280.tar.xz
cuberite-7ca191baf6bccf7e631cfe937d7a3d56af4e5280.tar.zst
cuberite-7ca191baf6bccf7e631cfe937d7a3d56af4e5280.zip
Diffstat (limited to '')
-rw-r--r--src/ClientHandle.h2
-rw-r--r--src/Server.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index d7468d345..22d052f22 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -415,7 +415,7 @@ private:
int m_LastStreamedChunkZ;
/** Number of ticks since the last network packet was received (increased in Tick(), reset in OnReceivedData()) */
- int m_TicksSinceLastPacket;
+ std::atomic<int> m_TicksSinceLastPacket;
/** Duration of the last completed client ping. */
std::chrono::steady_clock::duration m_Ping;
diff --git a/src/Server.h b/src/Server.h
index 4d0bc1c18..9131697c2 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -189,7 +189,7 @@ private:
bool m_bIsConnected; // true - connected false - not connected
- bool m_bRestarting;
+ std::atomic<bool> m_bRestarting;
/** The private key used for the assymetric encryption start in the protocols */
cRsaPrivateKey m_PrivateKey;