--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/06/26 10:50:34	917
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/07/02 14:58:44	948
@@ -48,13 +48,14 @@
 	
 	public static final int OPTIONS_MAP = 2003;
 	public static final int OPTIONS_GPSINFO = 2004;
-
-	
-
 	
 	public static final int DLG_PROGRESS = 3001;
 	public static final int DLG_STATIONNAME = 3002;
 	
+	
+	public static final int GPS_TIMEOUT_MS = 17500; //how long are we willing to wait for gps fix -in milliseconds
+	
+	
 	static enum LookupMethod {
 		ByLocation,
 		ByName,
@@ -139,6 +140,22 @@
 		}
 		
 	}
+	
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		
+		if (findStationsTask != null) {
+			findStationsTask.cancel(true);
+		}
+		if (locationLookup != null) {
+			locationLookup.stopSearch();
+		}
+		isRunning = false;
+	}
+
+	
 	protected void setTitle() {
 		String dialogTitle = getResources().getString(app_name);
 		switch (listType) {
@@ -379,7 +396,7 @@
 		showDialogSafe(DLG_PROGRESS);
 		
 		locationLookup.locateStations();
-		stationsFetched.sendEmptyMessageDelayed(LOCATIONFIXTIMEOUT, 20000);
+		stationsFetched.sendEmptyMessageDelayed(LOCATIONFIXTIMEOUT, GPS_TIMEOUT_MS);
 	}
 	
 	void startNameSearch(String name) {