pencil2d · MrStevns · Feb 16, 2023 · Feb 13, 2023 · Feb 16, 2023
diff --git a/app/src/actioncommands.cpp b/app/src/actioncommands.cpp
@@ -55,7 +55,6 @@ GNU General Public License for more details.
 #include "aboutdialog.h"
 #include "doubleprogressdialog.h"
 #include "checkupdatesdialog.h"
-#include "layeropacitydialog.h"
 #include "errordialog.h"
 
 
@@ -703,10 +702,9 @@ void ActionCommands::duplicateLayer()
     int currFrame = mEditor->currentFrame();
 
     Layer* toLayer = layerMgr->createLayer(fromLayer->type(), tr("%1 (copy)", "Default duplicate layer name").arg(fromLayer->name()));
-    toLayer->removeKeyFrame(1);
     fromLayer->foreachKeyFrame([&] (KeyFrame* key) {
         key = key->clone();
-        toLayer->addKeyFrame(key->pos(), key);
+        toLayer->addOrReplaceKeyFrame(key->pos(), key);
         if (toLayer->type() == Layer::SOUND)
         {
             mEditor->sound()->processSound(static_cast<SoundClip*>(key));
@@ -716,6 +714,9 @@ void ActionCommands::duplicateLayer()
             key->modification();
         }
     });
+    if (!fromLayer->keyExists(1)) {
+        toLayer->removeKeyFrame(1);
+    }
     mEditor->scrubTo(currFrame);
 }
 

diff --git a/core_lib/src/structure/layer.cpp b/core_lib/src/structure/layer.cpp
@@ -184,20 +184,24 @@ bool Layer::addNewKeyFrameAt(int position)
     return addKeyFrame(position, key);
 }
 
-bool Layer::addKeyFrame(int position, KeyFrame* pKeyFrame)
+void Layer::addOrReplaceKeyFrame(int position, KeyFrame* pKeyFrame)
 {
     Q_ASSERT(position > 0);
-    auto it = mKeyFrames.find(position);
-    if (it != mKeyFrames.end())
+    pKeyFrame->setPos(position);
+    loadKey(pKeyFrame);
+    markFrameAsDirty(position);
+}
+
+bool Layer::addKeyFrame(int position, KeyFrame* pKeyFrame)
+{
+    if (keyExists(position))
     {
         return false;
     }
 
     pKeyFrame->setPos(position);
-    mKeyFrames.insert(std::make_pair(position, pKeyFrame));
-
+    mKeyFrames.emplace(position, pKeyFrame);
     markFrameAsDirty(position);
-
     return true;
 }
 

diff --git a/core_lib/src/structure/layer.h b/core_lib/src/structure/layer.h
@@ -23,7 +23,6 @@ GNU General Public License for more details.
 #include <QString>
 #include <QDomElement>
 #include "pencilerror.h"
-#include "pencildef.h"
 
 class QMouseEvent;
 class QPainter;
@@ -99,11 +98,11 @@ class Layer : public QObject
     bool insertExposureAt(int position);
 
     bool addNewKeyFrameAt(int position);
-    virtual bool addKeyFrame(int position, KeyFrame*);
+    void addOrReplaceKeyFrame(int position, KeyFrame* pKeyFrame);
+    virtual bool addKeyFrame(int position, KeyFrame* pKeyFrame);
     virtual bool removeKeyFrame(int position);
     bool swapKeyFrames(int position1, int position2);
     bool moveKeyFrame(int position, int offset);
-    bool loadKey(KeyFrame*);
     KeyFrame* getKeyFrameAt(int position) const;
     KeyFrame* getLastKeyFrameAtPosition(int position) const;
     bool keyExistsWhichCovers(int frameNumber);
@@ -171,6 +170,7 @@ class Layer : public QObject
 protected:
     void setId(int LayerId) { mId = LayerId; }
     virtual KeyFrame* createKeyFrame(int position, Object*) = 0;
+    bool loadKey(KeyFrame*);
 
 private:
     void removeFromSelectionList(int position);

diff --git a/core_lib/src/structure/layerbitmap.cpp b/core_lib/src/structure/layerbitmap.cpp
@@ -47,12 +47,14 @@ BitmapImage* LayerBitmap::getLastBitmapImageAtFrame(int frameNumber, int increme
 void LayerBitmap::repositionFrame(QPoint point, int frame)
 {
     BitmapImage* image = getBitmapImageAtFrame(frame);
+    Q_ASSERT(image);
     image->moveTopLeft(point);
 }
 
 QRect LayerBitmap::getFrameBounds(int frame)
 {
     BitmapImage* image = getBitmapImageAtFrame(frame);
+    Q_ASSERT(image);
     return image->bounds();
 }
 

diff --git a/core_lib/src/structure/layercamera.h b/core_lib/src/structure/layercamera.h
@@ -22,6 +22,7 @@ GNU General Public License for more details.
 #include "layer.h"
 #include "camerafieldoption.h"
 #include "cameraeasingtype.h"
+#include "pencildef.h"
 
 class Camera;