fixed delete_all

[id3fs.git] / bin / id3fs-tag

diff --git a/bin/id3fs-tag b/bin/id3fs-tag
index 037dc78..42650c3 100755 (executable)
--- a/bin/id3fs-tag
+++ b/bin/id3fs-tag
@@ -89,18 +89,21 @@ sub do_deletes
     $file->delete_year()             if($delete_year);
     $file->delete_v1genre()          if($delete_v1genre);
     $file->delete_comment()          if($delete_comment);
-    $file->delete_all()              if($delete_all);
     $file->delete_genre()            if($delete_genre);
     $file->delete_tags($delete_tags) if($delete_tags);
     if(@replace_tags && $replace_tags[0])
     {
        $file->delete_tags($replace_tags[0]);
     }
+    $file->delete_all()              if($delete_all);
+
+    # we don't want to save the tag if we've deleted it
+    return 0 if($delete_all);
 
-    my $donesomething=($delete_artist || $delete_album || $delete_track    ||
-                      $delete_tracknum || $delete_year || $delete_v1genre ||
-                      $delete_comment || $delete_all || $delete_genre     ||
-                      $delete_tags || (@replace_tags && $replace_tags[0]));
+    my $donesomething=($delete_artist   || $delete_album || $delete_track   ||
+                      $delete_tracknum || $delete_year  || $delete_v1genre ||
+                      $delete_comment  || $delete_genre || $delete_tags    ||
+                      (@replace_tags && $replace_tags[0]));
     return($donesomething ? 1 : 0);
 }