← Back to branch summary

~jasperge/openlp/versenumbers

« back to all changes in this revision

Viewing changes to openlp/plugins/alerts/lib/alertsmanager.py

  • Committer: Tim Bentley
  • Author(s): Raoul Snyman
  • Date: 2015-02-28 06:47:35 UTC
  • mfrom: (2505.4.4 ccli-fixes)
  • Revision ID: tim.bentley@gmail.com-20150228064735-4bwzsqrq83bcoyiw
Some CCLI import fixes, a quitting dialog in one case, and empty lyrics in another.

Fix bug #1412216 where a song from CCLI without lyrics would cause a traceback - now just tell the user.
Fix bug #1423699 so that you're not logged out when you want to import more songs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/plugins/alerts/lib/alertsmanager.py
70
70
        """
71
71
        Format and request the Alert and start the timer.
72
72
        """
73
 
        if not self.alert_list or (self.live_controller.display.screens.display_count == 1 
 
73
        if not self.alert_list or (self.live_controller.display.screens.display_count == 1
74
74
                                   and not Settings().value('core/display on monitor')):
75
75
            return
76
76
        text = self.alert_list.pop(0)