--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2009/10/28 08:16:58	476
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2009/10/28 12:52:52	480
@@ -82,7 +82,7 @@
 	IntSet favorites = new IntSet();
 	
 	boolean showingFavorites = false;
-	
+	String dialogTitle;
 	SharedPreferences prefs;
 	
 	///////////////////////////////////////////////////////////////////////////////////////////
@@ -116,6 +116,8 @@
 			stations = (ArrayList<StationBean>) savedInstanceState.getSerializable("stations");
 			adapter.setStations(stations);
 			location = (GeoPair) savedInstanceState.getSerializable("location");
+			dialogTitle = savedInstanceState.getString("title");
+			setTitle(dialogTitle);
 		}
 	}
 
@@ -127,6 +129,7 @@
     		dialog.dismiss();
     	outState.putSerializable("stations", (ArrayList<StationBean>) stations);
     	outState.putSerializable("location", location);
+    	outState.putString("title", dialogTitle);
     }
 	
 	
@@ -483,15 +486,17 @@
 				String addr = lookupAddress(station.getLatitude(), station.getLongitude());
 				station.setAddress(addr);
 				
-				if (loc != null) { //only do the distance calc if we have a location
-					if (method.equals(LookupMethod.ByName) || method.equals(LookupMethod.ByList)) {
+				
+				if (method.equals(LookupMethod.ByName) || method.equals(LookupMethod.ByList)) {
+					if (loc != null) { //only do the distance calc if we have a location
 						dummy.setLatitude(station.getLatitude());
 						dummy.setLongitude(station.getLongitude());
 						station.setDistance( (int)loc.distanceTo(dummy) );
+					} else {
+						station.setDistance(0);
 					}
-				} else {
-					station.setDistance(0);
 				}
+
 			}						
 			
 			return null;
@@ -503,22 +508,21 @@
 			dialog.dismiss();
 			
 			//set title
-			String title;
 			switch (method) {
 			case ByLocation:
-				title = "Traininfo DK - Nearby stations";
+				dialogTitle = "Traininfo DK - Nearby stations";
 				break;
 			case ByName:
-				title = "Traininfo DK - Search";
+				dialogTitle = "Traininfo DK - Search";
 				break;
 			case ByList:
-				title = "Traininfo DK - Favorites";
+				dialogTitle = "Traininfo DK - Favorites";
 				break;
 			default:
-				title = "";//not possible					
+				dialogTitle = "";//not possible					
 			}				
 			
-			StationList.this.setTitle(title);
+			StationList.this.setTitle(dialogTitle);
 			//set title end
 			
 			if (success) {