From 5e4c179ca714cc31ee112b79f1917a7ab5f66ab9 Mon Sep 17 00:00:00 2001
From: Peter Osterlund <peterosterlund2@gmail.com>
Date: Thu, 26 Jan 2012 18:43:53 +0000
Subject: [PATCH] DroidFish: In "sticky" edit board mode, if the target square
 already contains the selected piece, clear the square instead of doing
 nothing.

---
 .../src/org/petero/droidfish/activities/EditBoard.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/DroidFish/src/org/petero/droidfish/activities/EditBoard.java b/DroidFish/src/org/petero/droidfish/activities/EditBoard.java
index 2cf5d32..11065ec 100644
--- a/DroidFish/src/org/petero/droidfish/activities/EditBoard.java
+++ b/DroidFish/src/org/petero/droidfish/activities/EditBoard.java
@@ -203,8 +203,12 @@ public class EditBoard extends Activity {
         } else {
             piece = -(m.from + 2);
         }
-        if (m.to >= 0)
-            pos.setPiece(m.to, piece);
+        if (m.to >= 0) {
+            if ((m.from < 0) && (pos.getPiece(m.to) == piece))
+                pos.setPiece(m.to, Piece.EMPTY);
+            else
+                pos.setPiece(m.to, piece);
+        }
         if (m.from >= 0)
             pos.setPiece(m.from, Piece.EMPTY);
         cb.setPosition(pos);