OpenLP

Merge lp:~staffj01/openlp/bug-932610 into lp:openlp

  1. bug-932610
  2. Merge into trunk
Proposed by Jonathan Stafford
Status: Merged
Approved by: Tim Bentley
Approved revision: 1878
Merged at revision: 1880
Proposed branch: lp:~staffj01/openlp/bug-932610
Merge into: lp:openlp
Diff against target: 21 lines (+2/-2)
1 file modified
openlp/core/ui/slidecontroller.py (+2/-2)
To merge this branch: bzr merge lp:~staffj01/openlp/bug-932610
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Raoul Snyman Approve
Review via email: mp+93179@code.launchpad.net

Description of the change

Fixes bug 932610 where OpenLP crashes if the "Service Item Slide Limits" was set to "Next Item" and the user tries to advance beyond the ends of a service item in the preview pane using the up/down arrow keys.

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
Revision history for this message
Tim Bentley (trb143) :
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/slidecontroller.py'
2--- openlp/core/ui/slidecontroller.py 2012-02-06 17:35:41 +0000
3+++ openlp/core/ui/slidecontroller.py 2012-02-15 10:46:18 +0000
4@@ -1203,7 +1203,7 @@
5 if wrap is None:
6 if self.slide_limits == SlideLimits.Wrap:
7 row = 0
8- elif self.slide_limits == SlideLimits.Next:
9+ elif self.isLive and self.slide_limits == SlideLimits.Next:
10 self.serviceNext()
11 return
12 else:
13@@ -1230,7 +1230,7 @@
14 if row == -1:
15 if self.slide_limits == SlideLimits.Wrap:
16 row = self.previewListWidget.rowCount() - 1
17- elif self.slide_limits == SlideLimits.Next:
18+ elif self.isLive and self.slide_limits == SlideLimits.Next:
19 self.keypress_queue.append(ServiceItemAction.PreviousLastSlide)
20 self._process_queue()
21 return