summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2009-08-31 16:25:32 -0600
committerBdale Garbee <bdale@gag.com>2009-08-31 16:25:32 -0600
commitb34474c1f3083e73b7184d519f54d4c8031836fd (patch)
tree720f81609578d70fd9d1fba5bf2213d77a7a0a57
parent8df169791835510d96c11a3b0aa3cc5b79fa7fde (diff)
parent0d65bff443c17d4d98c18b620ec075ab66b30efd (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
-rw-r--r--ao-view/aoview_monitor.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ao-view/aoview_monitor.c b/ao-view/aoview_monitor.c
index 1f4c8f72..8564014b 100644
--- a/ao-view/aoview_monitor.c
+++ b/ao-view/aoview_monitor.c
@@ -136,6 +136,7 @@ aoview_monitor_parse(const char *input_line)
data.gps.gps_time.hour = data.gps.gps_time.minute = data.gps.gps_time.second = 0;
data.gps.lat = data.gps.lon = 0;
data.gps.alt = 0;
+ tracking_pos = -1;
}
if (nword >= 46) {
data.gps.gps_extended = 1;
@@ -154,7 +155,7 @@ aoview_monitor_parse(const char *input_line)
data.gps.h_error = 0;
data.gps.v_error = 0;
}
- if (nword >= tracking_pos + 2 && strcmp(words[tracking_pos], "SAT") == 0) {
+ if (tracking_pos >= 0 && nword >= tracking_pos + 2 && strcmp(words[tracking_pos], "SAT") == 0) {
int c, n, pos;
aoview_parse_int(&n, words[tracking_pos + 1]);
pos = tracking_pos + 2;
@@ -172,6 +173,8 @@ aoview_monitor_parse(const char *input_line)
} else {
data.gps_tracking.channels = 0;
}
+ } else {
+ data.gps_tracking.channels = 0;
}
aoview_state_notify(&data);
return TRUE;