← Back to team overview

openlp-core team mailing list archive

Re: [Merge] lp:~phill-ridout/openlp/bug1125956 into lp:openlp

 

> 20      - self.verseOrderListGenerated.append(verse_def)
> 21      + if verse_def not in self.verseOrderListGenerated:
> 22      +     self.verseOrderListGenerated.append(verse_def)
> 
> Why are you changing this? Docs say:
>         Add a verse. This is the whole verse, lines split by \\n. It will also
>         attempt to detect duplicates. In this case it will just add to the
> verse
>         order.
> So we should append the verse_def in any case, shouldn't we?

Because OpenLP does not support verse numbering such as V1A and V1B we are dropping the A and B so we have two verses called V1 being added to a song (instead of V1A and V1B)

Each time V1 appears in the verse order both verses called V1 (actually V1A and V1B) were being added to the verse order.

With out this change V1 was being added to the verse order twice (once for each verse called V1), however because of the above statement the actual verse order shown in the live or preview controller repeated both verses.

This is a bit hard to clearly explain. It is probably easier for you to see the result by checking out this branch and importing the song attached to http://support.openlp.org/issues/1897

Import it once with out the change on line 20 and once with the change and you will see the problem.
-- 
https://code.launchpad.net/~phill-ridout/openlp/bug1125956/+merge/156075
Your team OpenLP Core is subscribed to branch lp:openlp.


References