From: Anthony Towns <aj@erisian.com.au>
Date: Sun, 21 Nov 2010 01:15:02 +0000 (+1000)
Subject: Merge branch 'sitemap' into buttonbox
X-Git-Tag: debian/0.7.1+117+ge7954c8~6
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=835b903727a2eabda8d9659cc46e53301f92897c;p=fw%2Faltos

Merge branch 'sitemap' into buttonbox

Conflicts:
	ao-tools/altosui/AltosSiteMap.java
---

835b903727a2eabda8d9659cc46e53301f92897c
diff --cc ao-tools/altosui/AltosSiteMap.java
index 50177d4e,e222e2c8..2c542061
--- a/ao-tools/altosui/AltosSiteMap.java
+++ b/ao-tools/altosui/AltosSiteMap.java
@@@ -211,10 -213,10 +213,12 @@@ public class AltosSiteMap extends JScro
  	boolean initialised = false;
  	public void show(AltosState state, int crc_errors) {
  		// if insufficient gps data, nothing to update
- 		if (state.gps == null || !state.gps.locked) {
++		if (state.gps == null)
++			return;
+ 		if (!state.gps.locked) {
  			if (state.pad_lat == 0 && state.pad_lon == 0)
  				return;
- 			if (state.ngps < 3)
+ 			if (state.gps.nsat < 4)
  				return;
  		}