am b6341e9e: Fix launcher crash

Merge commit 'b6341e9ee293cfbccc553f0d204a1087968d6482' into eclair-mr2 * commit 'b6341e9ee293cfbccc553f0d204a1087968d6482': Fix launcher crash
2009-11-02 08:54:36 -08:00
parent f758fd3a44 b6341e9ee2
commit bca63d4c5b
1 changed files with 4 additions and 1 deletions
@@ -1318,7 +1318,10 @@ public final class Launcher extends Activity
        ViewGroup parent = (ViewGroup) folder.getParent();
        if (parent != null) {
            parent.removeView(folder);
-            mDragController.removeDropTarget((DropTarget)folder);
+            if (folder instanceof DropTarget) {
+                // Live folders aren't DropTargets.
+                mDragController.removeDropTarget((DropTarget)folder);
+            }
        }
        folder.onClose();
    }