From: Eric Wong <e@80x24.org>
To: <dtas-all@nongnu.org>
Cc: Eric Wong <e@80x24.org>
Subject: [PATCH] tracklist: fix inf loop on ENOENT with repeat==1
Date: Sun, 10 May 2015 07:47:07 +0000 [thread overview]
Message-ID: <1431244027-26767-1-git-send-email-e@80x24.org> (raw)
If a file is missing, we must not respect the repeat option
set by the user to avoid infinite looping
---
lib/dtas/tracklist.rb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/dtas/tracklist.rb b/lib/dtas/tracklist.rb
index c008204..63fe4ec 100644
--- a/lib/dtas/tracklist.rb
+++ b/lib/dtas/tracklist.rb
@@ -69,12 +69,13 @@ class DTAS::Tracklist # :nodoc:
def advance_track(repeat_ok = true)
return if @list.empty?
# @repeat == 1 for single track repeat
- next_pos = @goto_pos || @pos + (@repeat == 1 ? 0 : 1)
+ repeat = repeat_ok ? @repeat : false
+ next_pos = @goto_pos || @pos + (repeat == 1 ? 0 : 1)
next_off = @goto_off # nil by default
@goto_pos = @goto_off = nil
if @list[next_pos]
@pos = next_pos
- elsif @repeat && repeat_ok
+ elsif repeat
next_pos = @pos = 0
else
return
--
EW
reply other threads:[~2015-05-10 7:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://80x24.org/dtas/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431244027-26767-1-git-send-email-e@80x24.org \
--to=e@80x24.org \
--cc=dtas-all@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/dtas.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).