From 5287818c4f1e4b0896dea2f2550364e3de2b4ff6 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sat, 17 Dec 2016 22:03:25 -0800 Subject: [PATCH] Handle no-copy/no-move permissions --- lib/kabufuda/Card.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/kabufuda/Card.cpp b/lib/kabufuda/Card.cpp index a304c55..d63eaf3 100644 --- a/lib/kabufuda/Card.cpp +++ b/lib/kabufuda/Card.cpp @@ -546,6 +546,10 @@ bool Card::copyFileTo(const std::unique_ptr& fh, Card& dest) { if (!fh) return false; + + if (!canCopy(fh)) + return false; + /* Do a self test to avoid adding a file to itself */ if (this == &dest) return false; @@ -589,7 +593,7 @@ bool Card::copyFileTo(const std::unique_ptr& fh, Card& dest) bool Card::moveFileTo(const std::unique_ptr& fh, Card& dest) { - if (copyFileTo(fh, dest)) + if (copyFileTo(fh, dest) && canMove(fh)) { deleteFile(fh); return true;