From: Keith Packard <keithp@keithp.com>
Date: Wed, 24 Jun 2015 05:00:33 +0000 (-0700)
Subject: altosdroid: Make sure whole flight state is spoken even when no-one is moving
X-Git-Tag: 1.6.0.3~4
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=b1b41e0823a60769e7d2d806f4d97ae043d7dae3

altosdroid: Make sure whole flight state is spoken even when no-one is moving

This eliminates the case where much of the flight state wasn't
reported if the tracker or receiver weren't moving.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index 9e953ffe..8eb08b99 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -195,8 +195,8 @@ public class AltosVoice {
 			return true;
 		}
 
-		if (last_tell_mode == TELL_MODE_FLIGHT) {
-			if (time_since_speak() < 10 * 1000 && last_flight_tell == TELL_FLIGHT_TRACK)
+		if (last_tell_mode == TELL_MODE_FLIGHT && last_flight_tell == TELL_FLIGHT_TRACK) {
+			if (time_since_speak() < 10 * 1000)
 				return false;
 			if (!target_moved(state) && !receiver_moved(receiver))
 				return false;