X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosVoice.java;h=325b89d2f553a0186a053b84cfc3c6108339fd12;hp=9e953ffe7fc967a779704a73b800ad9218969785;hb=d6445b3739ac2c5dd040efdb97317a6b2a48044a;hpb=bfa6cd8934b993bd4a67cfc7a4eeecf9b11915ef

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
index 9e953ffe..325b89d2 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java
@@ -22,7 +22,7 @@ import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
 import android.location.Location;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosVoice {
 
@@ -183,6 +183,9 @@ public class AltosVoice {
 		if (state == null)
 			return false;
 
+		if (last_tell_mode != TELL_MODE_FLIGHT)
+			last_flight_tell = TELL_FLIGHT_NONE;
+
 		if (state.state != last_state && AltosLib.ao_flight_boost <= state.state && state.state <= AltosLib.ao_flight_landed) {
 			speak(state.state_name());
 			if (descending(state.state) && !descending(last_state)) {
@@ -195,8 +198,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;
@@ -298,10 +301,6 @@ public class AltosVoice {
 		else
 			tell_mode = TELL_MODE_RECOVER;
 
-		AltosDebug.debug("last_serial %d serial %d last_mode %d mode %d\n",
-				 last_tell_serial, tell_serial,
-				 last_tell_mode, tell_mode);
-
 		if (tell_mode == TELL_MODE_PAD)
 			spoken = tell_pad(telem_state, state, from_receiver, receiver);
 		else if (tell_mode == TELL_MODE_FLIGHT)