From 66007a04da84cae1d81af5340b11706d5f25c89d Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 31 May 2012 17:09:45 -0700
Subject: Timeline: Bug fixes for deleting styles and their associated tracks
 correctly.

---
 js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 8dc19958..6b66bda9 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -969,8 +969,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 this.arrStyleTracks.push(restoredStyleTrack);
             }
             else if (layerEvent.layerEventType === "deleteStyle") {
-                // TODO: Delete the right track.  Index can be passed in event object, use that for splice().
-                this.arrStyleTracks.pop();
+            	// We are deleting a style, so delete the associated track
+            	this.arrStyleTracks.splice(layerEvent._event.selectedStyleIndex, 1);
             }
         }
     },
-- 
cgit v1.2.3