--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/05/18 14:02:13	731
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2010/06/26 11:06:12	919
@@ -139,6 +139,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) {
@@ -258,7 +274,7 @@
 				message.append( getString(stationlist_nolocation) );
 			}			
 			
-			MessageBox.showMessage(this, message.toString());
+			MessageBox.showMessage(this, message.toString(), false);
 			break;
 		default:
 			retval = super.onOptionsItemSelected(item);
@@ -437,7 +453,8 @@
 
 			case NOPROVIDER:
 				dismissDialogSafe(DLG_PROGRESS);
-				MessageBox.showMessage(StationList.this, getString(stationlist_nolocationprovider) );
+				MessageBox.showMessage(StationList.this, getString(stationlist_nolocationprovider), true );
+				//StationList.this.finish();
 				break;
 			case LOCATIONFIXTIMEOUT:				
 				if (isRunning) {
@@ -538,11 +555,14 @@
 					showMessageAndClose(getString(stationlist_nostations));
 				}
 				stations = stationProvider.getStations();
+
+				StationList.this.getListView().invalidateViews();
 				adapter.setStations( stations );				
 				
+				
 			} else { //communication or parse errors
 				AlertDialog.Builder builder = new AlertDialog.Builder(StationList.this);						
-				builder.setMessage(getString(stationlist_nearbyerror));				
+				builder.setMessage(getString(stationlist_fetcherror));				
 				builder.setCancelable(true);
 				builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
@@ -582,6 +602,7 @@
 				builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int id) {
 						dialog.dismiss();
+						StationList.this.finish();
 					}							
 				});