Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

1 files changed, 8 insertions, 0 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 77a4daae..ef85e067 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -955,6 +955,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
             this.currentLayerNumber = this.currentLayerNumber + 1;
             newLayerName = "Layer " + this.currentLayerNumber;
+
+            for(k = 0; k < arrLayersLength; k++){
+                if(this.arrLayers[k].layerData.layerName === newLayerName){
+                     this.currentLayerNumber = this.currentLayerNumber + 1;
+                     newLayerName = "Layer " + this.currentLayerNumber;
+                     break;
+                }
+            }
             thingToPush.layerData.layerName = newLayerName;
             thingToPush.layerData.layerTag = "<" + object.nodeName.toLowerCase() + ">";
             thingToPush.layerData.layerID = this.currentLayerNumber;