rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

AndroidGCS: Add back a few synchronize blocks in telemetry to avoid removing

Browse Source 
elements twice.
This commit is contained in:
James Cotton 2012-08-12 17:21:40 -05:00
parent 335ccc54a3
commit 785cda8052
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
androidgcs/src/org/openpilot/uavtalk/Telemetry.java
View File

@ -551,17 +551,22 @@ public class Telemetry {
// Get object information from queue (first the priority and then the regular queue)
ObjectQueueInfo objInfo;
if ( !objPriorityQueue.isEmpty() )
{
objInfo = objPriorityQueue.remove();
}
else if ( !objQueue.isEmpty() )
{
objInfo = objQueue.remove();
}
else
{
return;
synchronized (objPriorityQueue) {
if ( !objPriorityQueue.isEmpty() )
{
objInfo = objPriorityQueue.remove();
} else {
synchronized (objQueue) {
if ( !objQueue.isEmpty() )
{
objInfo = objQueue.remove();
}
else
{
return;
}
}
}
}
// Check if a connection has been established, only process GCSTelemetryStats updates