openlp-core team mailing list archive

[phill <phill.ridout@xxxxxxxxxxxxxx>]

phill has proposed merging lp:~phill-ridout/openlp/bug1022038 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1022038 in OpenLP: "Clicking next track after backing track has finished playing causes Index error"
  https://bugs.launchpad.net/openlp/+bug/1022038

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/bug1022038/+merge/119055
-- 
https://code.launchpad.net/~phill-ridout/openlp/bug1022038/+merge/119055
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/bug1022038 into lp:openlp.

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2012-07-01 18:41:59 +0000
+++ openlp/core/ui/maindisplay.py	2012-08-09 21:50:45 +0000
@@ -580,7 +580,7 @@
         self.playlist.extend(map(Phonon.MediaSource, filenames))
 
     def next(self):
-        if not self.repeat and self.currentIndex + 1 == len(self.playlist):
+        if not self.repeat and self.currentIndex + 1 >= len(self.playlist):
             return
         isPlaying = self.mediaObject.state() == Phonon.PlayingState
         self.currentIndex += 1