--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2011/07/08 13:10:53	1558
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2011/07/10 07:45:38	1577
@@ -135,15 +135,18 @@
 		
 		ProviderFactory.purgeOldEntries(); //cleanup before fetching more data
 		
+		if (listType == ListType.ListSearch) {
+			enableNamesearchField();
+		}
+		
 		if (savedInstanceState == null) {
-
-			
+		
 			switch (listType) {
 			case ListNearest:
 				startNearestLookup();
 				break;
 			case ListSearch:				
-				enableNamesearchField();
+				// do nothing here
 				break;
 			case ListFavorites:
 				startFavoriteLookup();
@@ -153,6 +156,8 @@
 			}
 			
 		} else {
+			((TextView)findViewById(R.id.stationsearch)).setText(  savedInstanceState.getString( "search") );
+			
 			stations = (StationBean) savedInstanceState.getSerializable("stations");
 			adapter.setStations(stations);
 		}
@@ -235,6 +240,7 @@
     	if (dialog != null && dialog.isShowing())
     		dialog.dismiss();
     	outState.putSerializable("stations", (StationBean) stations);
+    	outState.putString("search", ((TextView)findViewById(R.id.stationsearch)).getText().toString() );
     	
     }