T29645

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
index b97e7b2..61b8413 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
@@ -775,6 +775,11 @@ public class EverFolderActivity extends BaseActivity implements LockListener {
                        if (src.getParent() == dst.getParent() || dst.getParent() < 0) {
                                dp = sp;
                        } else {
+                               if (dst.getParent() == srcId){
+                                       // フォルダをノートにドラッグ
+                                       // 移動先がフォルダ自身
+                                       return;
+                               }
                                dp = dao.searchById(dst.getParent());
                        }
                        if (dp == null) {