--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/07/10 08:35:16	975
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableFetcher.java	2010/07/10 09:10:50	976
@@ -155,18 +155,20 @@
 	    		final int lastIdx = (timetableList.size() - 1);
 	    		
 	    		TimetableBean current = timetableList.get(i);
-	    		if (current.isCancelled() && i == 0) {
-	    			current.setDeparture(cancelledString);
-	    		} else if (current.isCancelled() && i == lastIdx) {
-	    			current.setArrival(cancelledString);
-	    		} else if (current.isCancelled() && i>0 && i<lastIdx) {
-	    			TimetableBean next = timetableList.get(i+1);
-	    			TimetableBean prev = timetableList.get(i-1);
-	    			
-	    			if (next.isCancelled())
-	    				current.setDeparture(cancelledString);
-	    			if (prev.isCancelled())
-	    				current.setArrival(cancelledString);
+	    		if (current.isCancelled()) {
+		    		if (i == 0) {
+		    			current.setDeparture(cancelledString);
+		    		} else if (i == lastIdx) {
+		    			current.setArrival(cancelledString);
+		    		} else if (i>0 && i<lastIdx) {
+		    			TimetableBean next = timetableList.get(i+1);
+		    			TimetableBean prev = timetableList.get(i-1);
+		    			
+		    			if (next.isCancelled())
+		    				current.setDeparture(cancelledString);
+		    			if (prev.isCancelled())
+		    				current.setArrival(cancelledString);
+		    		}
 	    		}
 	    	}