diff --git a/panda/src/net/connectionWriter.cxx b/panda/src/net/connectionWriter.cxx index f7325a0f12..97a2093be7 100644 --- a/panda/src/net/connectionWriter.cxx +++ b/panda/src/net/connectionWriter.cxx @@ -159,7 +159,7 @@ get_current_queue_size() const { // // If block is true, this will not return false if the // send queue is filled; instead, it will wait until -// this is space available. +// there is space available. //////////////////////////////////////////////////////////////////// bool ConnectionWriter:: send(const Datagram &datagram, const PT(Connection) &connection, bool block) { @@ -198,7 +198,7 @@ send(const Datagram &datagram, const PT(Connection) &connection, bool block) { // // If block is true, this will not return false if the // send queue is filled; instead, it will wait until -// this is space available. +// there is space available. //////////////////////////////////////////////////////////////////// bool ConnectionWriter:: send(const Datagram &datagram, const PT(Connection) &connection, diff --git a/panda/src/net/datagramQueue.cxx b/panda/src/net/datagramQueue.cxx index 39fa7e4b32..a6b9abe2f9 100644 --- a/panda/src/net/datagramQueue.cxx +++ b/panda/src/net/datagramQueue.cxx @@ -22,7 +22,10 @@ // Description: //////////////////////////////////////////////////////////////////// DatagramQueue:: -DatagramQueue() : _cv(_cvlock) { +DatagramQueue() : + _cvlock("DatagramQueue::_cvlock"), + _cv(_cvlock) +{ _shutdown = false; _max_queue_size = get_net_max_write_queue(); }