Handle case when same hash and path appears in both adds and removes

diff --git a/SongSync.sh b/SongSync.sh
index 54868e2..afe993b 100755 (executable)
--- a/SongSync.sh
+++ b/SongSync.sh
@@ -52,6 +52,13 @@ if [ "$1" = "apply" ]; then
                 echo "More than one SM file in ${path}, aborting"
                 exit
             fi
+
+            if [ "${removes[${path}]}" = "$hash" ]; then
+                echo "Same hash ($hash) and path ($path) in adds and removes. Ignoring."
+                unset removes["$hash"]
+                continue
+            fi
+
             adds["${path}"]+="$hash"
         fi
 
@@ -65,6 +72,12 @@ if [ "$1" = "apply" ]; then
             # I suppose it could happen that one of these borked paths were moved to a different location, but
             # in that case thered be multiple sms in the adds path. So... I guess its OK.
             if [ -z "${removes[${path}]}" ]; then
+                if [ "${adds[${path}]}" = "$hash" ]; then
+                    echo "Same hash ($hash) and path ($path) in adds and removes. Ignoring."
+                    unset adds["$hash"]
+                    continue
+                fi
+
                removes["${path}"]+="$hash"
             fi
         fi