From f66be9492f805b89c1b5889892492272cad6350a Mon Sep 17 00:00:00 2001
From: Yuji Konishi <yuji.k64613@gmail.com>
Date: Sat, 22 Sep 2012 17:47:41 +0900
Subject: [PATCH] T29649 T29648

---
 .../EverFolder/src/com/yuji/ef/EverFolderActivity.java         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
index 86b81bd..916c932 100644
--- a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
@@ -728,11 +728,11 @@ public class EverFolderActivity extends BaseActivity implements LockListener {
 				// 同じ場所に移動
 				return;
 			}
-			if (!isFileNode(src) && !isMovable(srcId, dstId)) {
-				// 再帰的な移動
+			if (src instanceof RootNode){
+				// ルートは移動できない
 				return;
 			}
-
+			
 			Node sp = dao.searchById(src.getParent());
 			if (sp == null) {
 				throw new EfException(EfError.NOT_FOUND);
@@ -751,6 +751,10 @@ public class EverFolderActivity extends BaseActivity implements LockListener {
 			if (dp == null) {
 				throw new EfException(EfError.NOT_FOUND);
 			}
+			if (!isFileNode(src) && !isMovable(srcId, dp.getId())) {
+				// 再帰的な移動
+				return;
+			}
 
 			SQLiteDatabase db = DatabaseHelper.getInstance()
 					.getSQLiteDatabase();
-- 
2.11.0