Single-track support broke multi-track. Fix both.

diff --git a/flac2mp3 b/flac2mp3
index 65e3f8f..c0cce30 100755 (executable)
--- a/flac2mp3
+++ b/flac2mp3
@@ -85,6 +85,11 @@ sub get_decode_args {
         push(@args, $arg);
     }
 
+    # If no cue sheet, stick a dummy in here.
+    if (@args == 0) {
+        @args = ([]);
+    }
+
     return @args;
 }
 
@@ -184,6 +189,7 @@ sub flac2mp3 {
     arg('--ty', \$date);
     arg('--tn', \$track);
 
+    $skip_arg ||= '';
     $until_arg ||= '';
     run_or_die(join(' ', "flac $flac_options -cd $skip_arg $until_arg '$fn'",
                     " | lame $lame_options $title $artist $album $date $track",
@@ -215,7 +221,7 @@ MAIN: {
 
         for my $i (0..$#titles) {
             flac2mp3($fn, $titles[$i], ($artists[$i] or $artist), $album, $date,
-                     $track, (defined($args[$i]) and @{$args[$i]} or ''));
+                     $track, @{$args[$i]});
             $track = $i + 2;
         }
     }