--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/08/03 06:36:29	1008
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/09/08 06:25:13	1028
@@ -52,7 +52,7 @@
 	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
+	public static final int GPS_TIMEOUT_MS = 15000; //how long are we willing to wait for gps fix -in milliseconds
 	
 	
 	static enum LookupMethod {
@@ -115,6 +115,8 @@
 		
 		isLaunchedforShortcut = getIntent().getBooleanExtra("shortcut", false);
 		
+		ProviderFactory.purgeOldEntries(); //cleanup before fetching more data
+		
 		if (savedInstanceState == null) {
 
 			
@@ -140,18 +142,23 @@
 		
 	}
 	
+	
+
+
+
 
 	@Override
 	protected void onDestroy() {
 		super.onDestroy();
 		
-		if (findStationsTask != null) {
-			findStationsTask.cancel(true);
-		}
+		isRunning = false;
+		
 		if (locationLookup != null) {
 			locationLookup.stopSearch();
 		}
-		isRunning = false;
+		if (findStationsTask != null) {
+			findStationsTask.cancel(true);
+		}		
 	}