OpenLP

Merge lp:~trb143/openlp/bug-883975 into lp:openlp

  1. bug-883975
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Approved by: Andreas Preikschat
Approved revision: 1755
Merged at revision: 1793
Proposed branch: lp:~trb143/openlp/bug-883975
Merge into: lp:openlp
Diff against target: 12 lines (+1/-1)
1 file modified
openlp/core/ui/maindisplay.py (+1/-1)
To merge this branch: bzr merge lp:~trb143/openlp/bug-883975
Reviewer Review Type Date Requested Status
Andreas Preikschat (community) Approve
Review via email: mp+80832@code.launchpad.net

This proposal supersedes a proposal from 2011-10-31.

Description of the change

Stop alerts crashing if triggered with splash screen

To post a comment you must log in.
Revision history for this message
Andreas Preikschat (googol-deactivatedaccount) wrote : Posted in a previous version of this proposal

You are passing the wrong argument.

def build_html(item, screen, islive, background, image=None,
    plugins=None):

self.webView.setHtml(build_html(serviceItem, self.screen,
    self.isLive, None, self.plugins))

review: Needs Fixing
Revision history for this message
Andreas Preikschat (googol-deactivatedaccount) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/ui/maindisplay.py'
2--- openlp/core/ui/maindisplay.py 2011-10-29 19:13:11 +0000
3+++ openlp/core/ui/maindisplay.py 2011-10-31 18:23:29 +0000
4@@ -171,7 +171,7 @@
5 serviceItem = ServiceItem()
6 serviceItem.bg_image_bytes = image_to_byte(self.initialFrame)
7 self.webView.setHtml(build_html(serviceItem, self.screen,
8- self.isLive, None))
9+ self.isLive, None, plugins=self.plugins))
10 self.__hideMouse()
11 # To display or not to display?
12 if not self.screen[u'primary']: