Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -4045,11 +4045,13 @@ void* Application::processVoxels(void* args) { · 4044 unmodified lines | |||
| 4045 | app->_wantToKillLocalVoxels = false; | 4045 | app->_wantToKillLocalVoxels = false; |
| 4046 | } | 4046 | } |
| 4047 | 4047 | ||
| 4048 | app->_voxelPacketMutex.lock(); | ||
| 4048 | while (app->_voxelPackets.size() > 0) { | 4049 | while (app->_voxelPackets.size() > 0) { |
| 4049 | NetworkPacket& packet = app->_voxelPackets.front(); | 4050 | NetworkPacket& packet = app->_voxelPackets.front(); |
| 4050 | app->processVoxelPacket(packet.getSenderAddress(), packet.getData(), packet.getLength()); | 4051 | app->processVoxelPacket(packet.getSenderAddress(), packet.getData(), packet.getLength()); |
| 4051 | app->_voxelPackets.erase(app->_voxelPackets.begin()); | 4052 | app->_voxelPackets.erase(app->_voxelPackets.begin()); |
| 4052 | } | 4053 | } |
| 4054 | app->_voxelPacketMutex.unlock(); | ||
| 4053 | 4055 | ||
| 4054 | if (!app->_enableProcessVoxelsThread) { | 4056 | if (!app->_enableProcessVoxelsThread) { |
| 4055 | break; | 4057 | break; |
| @@ -4063,7 +4065,9 @@ void* Application::processVoxels(void* args) { · 7 unmodified lines | |||
| 4063 | } | 4065 | } |
| 4064 | 4066 | ||
| 4065 | void Application::queueVoxelPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) { | 4067 | void Application::queueVoxelPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) { |
| 4068 | _voxelPacketMutex.lock(); | ||
| 4066 | _voxelPackets.push_back(NetworkPacket(senderAddress, packetData, packetLength)); | 4069 | _voxelPackets.push_back(NetworkPacket(senderAddress, packetData, packetLength)); |
| 4070 | _voxelPacketMutex.unlock(); | ||
| 4067 | } | 4071 | } |
| 4068 | 4072 | ||
| 4069 | void Application::processVoxelPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) { | 4073 | void Application::processVoxelPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) { |