# HG changeset patch
# User hamidouk
# Date 1328022159 -3600
# Node ID 7779fbe8432e04548d252c9a0dfd750fda4c1f68
# Parent  332e3f37e392da7c02883524be258fff408266cb# Parent  f48e7b755b61f375d827ad64c23889e8485ecf39
Merge with upstream

diff -r f48e7b755b61 -r 7779fbe8432e src/ldt/ldt/static/ldt/js/LdtPlayer-release.js
--- a/src/ldt/ldt/static/ldt/js/LdtPlayer-release.js	Tue Jan 31 15:41:01 2012 +0100
+++ b/src/ldt/ldt/static/ldt/js/LdtPlayer-release.js	Tue Jan 31 16:02:39 2012 +0100
@@ -2745,9 +2745,14 @@
   
   var currentTime = this._Popcorn.currentTime();
   var currentAnnotation = this._serializer.currentChapitre(currentTime);
-  if (IriSP.null_or_undefined(currentAnnotation))
-    var currentAnnotation = this._serializer.currentAnnotation(currentTime)[0]; // FIXME : use the others ?
-
+  if (IriSP.null_or_undefined(currentAnnotation)) {
+    var c_annots = this._serializer.currentAnnotation(currentTime)
+    if (c_annots.length != 0)
+      var currentAnnotation = c_annots[0]; // FIXME : use the others ?
+    else
+      return;
+  }
+  
   /* move the arrow only if the current annotation changes */
   if (currentAnnotation != this._oldAnnotation) {
     var begin = (+ currentAnnotation.begin) / 1000;