From f4e1879a2df1949531d05722fd78fd5753c26991 Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Wed, 3 Aug 2016 17:43:07 -0700
Subject: [PATCH] stop listening to tick source on time system change

---
 .../conductor-v2/conductor/src/ui/modes/FollowMode.js         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/features/conductor-v2/conductor/src/ui/modes/FollowMode.js b/platform/features/conductor-v2/conductor/src/ui/modes/FollowMode.js
index 600dac4376..8385a17069 100644
--- a/platform/features/conductor-v2/conductor/src/ui/modes/FollowMode.js
+++ b/platform/features/conductor-v2/conductor/src/ui/modes/FollowMode.js
@@ -83,6 +83,10 @@ define(
             TimeConductorMode.prototype.selectedTimeSystem.apply(this, arguments);
 
             if (timeSystem) {
+                if (this.tickSourceUnlisten) {
+                    this.tickSourceUnlisten();
+                }
+
                 var defaults = timeSystem.defaults()[0];
 
                 if (arguments.length > 0) {