From 3b623c71650f86069bdc1f69b4880cfec04f2c82 Mon Sep 17 00:00:00 2001
From: Joren Dandois <Joren@lunargravity.be>
Date: Sat, 4 Jul 2020 01:50:14 +0200
Subject: [PATCH] Added check for merge with next layer

---
 src/js/controller/piskel/PiskelController.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/js/controller/piskel/PiskelController.js b/src/js/controller/piskel/PiskelController.js
index ae34643f..fd8ab3d5 100644
--- a/src/js/controller/piskel/PiskelController.js
+++ b/src/js/controller/piskel/PiskelController.js
@@ -294,6 +294,10 @@
   ns.PiskelController.prototype.mergeDownLayerAt = function (index) {
     var layer = this.getLayerByIndex(index);
     var downLayer = this.getLayerByIndex(index - 1);
+    if (layer.locked || downLayer.locked) {
+      window.console.error('Could not merge with later below. One of the layers is locked.');
+      return;
+    }
     if (layer && downLayer) {
       var mergedLayer = pskl.utils.LayerUtils.mergeLayers(layer, downLayer);
       this.removeLayerAt(index);