diff options
| author | tycho <work.tycho@gmail.com> | 2015-06-27 13:10:24 +0200 |
|---|---|---|
| committer | tycho <work.tycho@gmail.com> | 2015-06-27 13:10:24 +0200 |
| commit | 257011b44090b91914777d9acee4c2b4ff9412bf (patch) | |
| tree | 75627cd7cb32de78ddbde120835a4d63b64f30c7 | |
| parent | Merge pull request #2294 from bibo38/horsefix (diff) | |
| download | cuberite-257011b44090b91914777d9acee4c2b4ff9412bf.tar cuberite-257011b44090b91914777d9acee4c2b4ff9412bf.tar.gz cuberite-257011b44090b91914777d9acee4c2b4ff9412bf.tar.bz2 cuberite-257011b44090b91914777d9acee4c2b4ff9412bf.tar.lz cuberite-257011b44090b91914777d9acee4c2b4ff9412bf.tar.xz cuberite-257011b44090b91914777d9acee4c2b4ff9412bf.tar.zst cuberite-257011b44090b91914777d9acee4c2b4ff9412bf.zip | |
| -rw-r--r-- | src/ClientHandle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ClientHandle.h b/src/ClientHandle.h index 13b5f87e4..dc448fc11 100644 --- a/src/ClientHandle.h +++ b/src/ClientHandle.h @@ -23,7 +23,7 @@ #include <array> - +#include <atomic> // fwd: @@ -447,7 +447,7 @@ private: // TODO: Add Kicking here as well } ; - eState m_State; + std::atomic<eState> m_State; /** m_State needs to be locked in the Destroy() function so that the destruction code doesn't run twice on two different threads */ cCriticalSection m_CSDestroyingState; |