Merge branch 'open1182' into open1193

nasa · Oct 11, 2016 · 938bf3c · 938bf3c
2 parents 3910437 + 8b2047c
commit 938bf3c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/platform/features/conductor-v2/conductor/src/ui/TimeConductorMode.js b/platform/features/conductor-v2/conductor/src/ui/TimeConductorMode.js
@@ -176,11 +176,12 @@ define(
          * @returns {TimeSystemDeltas}
          */
         TimeConductorMode.prototype.deltas = function (deltas) {
-            if (arguments.length !== 0 && this.metadata().key!=='fixed') {
+            if (arguments.length !== 0) {
                 var bounds = this.calculateBoundsFromDeltas(deltas);
-
                 this.dlts = deltas;
-                this.conductor.bounds(bounds);
+                if (this.metadata().key!=='fixed') {
+                    this.conductor.bounds(bounds);
+                }
             }
             return this.dlts;
         };