Merge branch 'refs/heads/timeline-local' into TimelineUber

1 files changed, 2 insertions, 2 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 447eaf47..ae6ff114 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);
             }
         }
     },