From 78a61e099b48145724d16d96de3bc0ea7ad70adf Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Fri, 18 May 2018 16:55:19 +1200
Subject: [PATCH] Removed last

---
 desktop/sources/scripts/generator.js | 5 ++---
 desktop/sources/scripts/tool.js      | 6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/desktop/sources/scripts/generator.js b/desktop/sources/scripts/generator.js
index 1cd0a3d..b62769f 100644
--- a/desktop/sources/scripts/generator.js
+++ b/desktop/sources/scripts/generator.js
@@ -20,7 +20,7 @@ function Generator(layer)
     return l;
   }
 
-  this.render = function(last_seg,segment,mirror = 0)
+  this.render = function(segment,mirror = 0)
   {
     var type = segment.type;
     var vertices = segment.vertices;
@@ -31,7 +31,6 @@ function Generator(layer)
       if(skip > 0){ skip -= 1; continue; }
       
       var vertex = vertices[id]
-      var last = last_seg && last_seg.vertices[last_seg.vertices.length-1] ? last_seg.vertices[last_seg.vertices.length-1] : null
       var next = vertices[parseInt(id)+1]
       var after_next = vertices[parseInt(id)+2]
 
@@ -71,7 +70,7 @@ function Generator(layer)
     var s = ""
     for(id in layer){
       var seg = layer[id];
-      s += `${this.render(layer[id-1],seg,mirror)}`
+      s += `${this.render(seg,mirror)}`
     }
 
     return s;
diff --git a/desktop/sources/scripts/tool.js b/desktop/sources/scripts/tool.js
index 522d454..d8da5a4 100644
--- a/desktop/sources/scripts/tool.js
+++ b/desktop/sources/scripts/tool.js
@@ -66,7 +66,10 @@ function Tool()
   this.replace = function(dot)
   {
     if(!dot.layers || dot.layers.length != 3){ console.warn("Incompatible version"); return; }
-    
+
+    if(dot.settings.width && dot.settings.height){
+      dot.settings.size = {width:dot.settings.width,height:dot.settings.height}
+    }
     if(this.settings && (this.settings.size.width != dot.settings.size.width || this.settings.size.height != dot.settings.size.height)){
       dotgrid.set_size({width:dot.settings.size.width,height:dot.settings.size.height})
     }
@@ -161,6 +164,7 @@ function Tool()
     for(id in this.layer()){
       var stroke = this.layer()[id];
       if(stroke.type != content.type){ continue; }
+      if(!stroke.vertices){ continue; }
       if(!stroke.vertices[stroke.vertices.length-1]){ continue; }
       if(stroke.vertices[stroke.vertices.length-1].x != content.vertices[0].x){ continue; }
       if(stroke.vertices[stroke.vertices.length-1].y != content.vertices[0].y){ continue; }