|
|
@ -299,7 +299,7 @@ Respack.prototype.parseImage = function(file) { |
|
|
|
this.images.push(img); |
|
|
|
this.images.push(img); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
let existing = this.getImage(name); |
|
|
|
let existing = this.getImage(name); |
|
|
|
debug("WARNING: Image", name, "already exists! Conflict with", file.name, "and", existing.name); |
|
|
|
console.log("WARNING: Image", name, "already exists! Conflict with", file.name, "and", existing.name); |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -338,6 +338,9 @@ Respack.prototype.parseImageQueue = function() { |
|
|
|
// Maintain order
|
|
|
|
// Maintain order
|
|
|
|
return imagePromise; |
|
|
|
return imagePromise; |
|
|
|
}).then(response => { |
|
|
|
}).then(response => { |
|
|
|
|
|
|
|
// Don't crash if the respack had duplicate images
|
|
|
|
|
|
|
|
if(!response) |
|
|
|
|
|
|
|
return; |
|
|
|
let newImg = new Image(); |
|
|
|
let newImg = new Image(); |
|
|
|
newImg.src = response.bitmap; |
|
|
|
newImg.src = response.bitmap; |
|
|
|
if (response.img.animated) { |
|
|
|
if (response.img.animated) { |
|
|
|