History

Merge branch 'master' of https://github.com/worklist/hifi into glow

Andrzej Kapolka committed 13 years ago

Commit 581b6092 parents 01cd0d2 0bd54842 files · +5 −1Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

interface/src/Application.cpp+4−0
@@ -4077,11 +4077,13 @@ void* Application::processVoxels(void* args) { · 4076 unmodified lines
40774077 app->_wantToKillLocalVoxels = false;
40784078 }
40794079
4080+ app->_voxelPacketMutex.lock();
40804081 while (app->_voxelPackets.size() > 0) {
40814082 NetworkPacket& packet = app->_voxelPackets.front();
40824083 app->processVoxelPacket(packet.getSenderAddress(), packet.getData(), packet.getLength());
40834084 app->_voxelPackets.erase(app->_voxelPackets.begin());
40844085 }
4086+ app->_voxelPacketMutex.unlock();
40854087
40864088 if (!app->_enableProcessVoxelsThread) {
40874089 break;
@@ -4095,7 +4097,9 @@ void* Application::processVoxels(void* args) { · 7 unmodified lines
40954097 }
40964098
40974099 void Application::queueVoxelPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) {
4100+ _voxelPacketMutex.lock();
40984101 _voxelPackets.push_back(NetworkPacket(senderAddress, packetData, packetLength));
4102+ _voxelPacketMutex.unlock();
40994103 }
41004104
41014105 void Application::processVoxelPacket(sockaddr& senderAddress, unsigned char* packetData, ssize_t packetLength) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t