--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/01/28 08:55:19	561
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/05/19 16:27:41	742
@@ -13,6 +13,7 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -60,13 +61,16 @@
 		
 		findViewById(R.id.header).setOnClickListener( mapLauncher );
 		
-		NumberFormat format = NumberFormat.getNumberInstance();
-		format.setMaximumFractionDigits(1);
-		format.setMinimumFractionDigits(1);
-		
-
 		int distance = station.getDistance();
-		((TextView) findViewById(R.id.stationDistance)).setText( format.format((double)distance/1000.0) + " km." );
+		if (distance != 0) {
+			NumberFormat format = NumberFormat.getNumberInstance();
+			format.setMaximumFractionDigits(1);
+			format.setMinimumFractionDigits(1);
+		
+			((TextView) findViewById(R.id.stationDistance)).setText( format.format((double)distance/1000.0) + " km." );
+		} else {
+			((TextView) findViewById(R.id.stationDistance)).setVisibility(View.GONE);
+		}
 		
 	
 		if (station.isRegional() == false && station.isSTrain() == false) {
@@ -198,8 +202,13 @@
 					public void onClick(DialogInterface dialog, int id) {
 						dialog.dismiss();
 					}							
-				});												
-				builder.show();				
+				});
+				
+				try {
+					builder.show();
+				} catch (android.view.WindowManager.BadTokenException e) {					
+					Log.i("DepartureList", "BadTokenException"); // this can happen if the user switched away from this activity, while doInBackground was running
+				}				
 			}
 		}