Fixes #48 (Waehrend der Anzeige des Kamerabildes wird der Automatikmo…

…dus nicht unterbrochen).
itm · Jan 27, 2012 · 106dd4e · 106dd4e
1 parent 6a66835
commit 106dd4e
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/js/application.js b/js/application.js
@@ -328,9 +328,10 @@ function refreshMarker(url) {
 			});
 		});
 
-		checkIfPassatIsPassed();
+		if (!checkIfPassatIsPassed()){
+			showArea(currentArea);
+		}
 
-		showArea(currentArea);
 	});
 }
 
@@ -348,18 +349,23 @@ function checkIfPassatIsPassed() {
 	});
 
 	if ( !vesselInBounds || 'undefined'==vesselInBounds )
-		return;
+		return false;
 
 	if ($.inArray(vesselInBounds.vessel.name,shownVessels) == "-1"){
 		shownVessels.push(vesselInBounds.vessel.name);
 		showCamOrImage(vesselInBounds);
+		return true;
 	}
+	return false;
 
 }
 
 function showCamOrImage(ship){
 
-	var restart = function(){ cycleAreas(currentArea); };
+	var restart = function(){
+		 cycleAreas(currentArea);
+	};
+
 	// stop cycling
 	$("#on_off").stopTime("cycling");