Fix Editor::canPaste() conditions

- Warning: '==' unsafe mix of type 'Layer::LAYER_TYPE' and type 'bool' in operation
pencil2d · Mar 8, 2022 · de0a5c8 · de0a5c8
1 parent 0467c63
commit de0a5c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core_lib/src/interface/editor.cpp b/core_lib/src/interface/editor.cpp
@@ -1201,7 +1201,8 @@ bool Editor::canPaste() const
     Layer* layer = layers()->currentLayer();
     auto clipboardMan = clipboards();
     auto layerType = layer->type();
-    return (layerType == clipboardMan->framesTypeChanged(layer) && clipboardMan->framesIsEmpty()) ||
+
+    return (layerType == clipboardMan->framesLayerType() && !clipboardMan->framesIsEmpty()) ||
            (layerType == Layer::BITMAP && clipboardMan->getBitmapClipboard().isLoaded()) ||
            (layerType == Layer::VECTOR && !clipboardMan->getVectorClipboard().isEmpty());
 }

diff --git a/core_lib/src/managers/clipboardmanager.h b/core_lib/src/managers/clipboardmanager.h
@@ -63,7 +63,7 @@ class ClipboardManager: public BaseManager
     VectorImage getVectorClipboard() const { return mVectorImage; }
     std::map<int, KeyFrame*> getClipboardFrames() { return mFrames; }
 
-    bool framesTypeChanged(const Layer* layer) const { return layer->type() != mFramesType; }
+    bool framesLayerType() const { return mFramesType; }
     bool framesIsEmpty() const { return mFrames.empty(); }
 
 private: