projects
/
oweals
/
minetest.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c39a85a
)
src/network/connection.h: Fix race condition
author
Břetislav Štec
<valsiterb@gmail.com>
Sat, 1 Aug 2015 11:53:15 +0000
(13:53 +0200)
committer
est31
<MTest31@outlook.com>
Sat, 1 Aug 2015 18:44:17 +0000
(20:44 +0200)
src/network/connection.h
patch
|
blob
|
history
diff --git
a/src/network/connection.h
b/src/network/connection.h
index b1f9e70a8a5a68d6fdc857ac843d877e63d7540e..c48da2c70b50b7a248eb6751e334098e5ba7db3d 100644
(file)
--- a/
src/network/connection.h
+++ b/
src/network/connection.h
@@
-1053,7
+1053,11
@@
protected:
void PrintInfo(std::ostream &out);
void PrintInfo();
- std::list<u16> getPeerIDs() { return m_peer_ids; }
+ std::list<u16> getPeerIDs()
+ {
+ JMutexAutoLock peerlock(m_peers_mutex);
+ return m_peer_ids;
+ }
UDPSocket m_udpSocket;
MutexedQueue<ConnectionCommand> m_command_queue;