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
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2012-02-06 17:35:41 +0000
+++ openlp/core/ui/slidecontroller.py 2012-02-15 10:46:18 +0000
@@ -1203,7 +1203,7 @@
1203 if wrap is None:1203 if wrap is None:
1204 if self.slide_limits == SlideLimits.Wrap:1204 if self.slide_limits == SlideLimits.Wrap:
1205 row = 01205 row = 0
1206 elif self.slide_limits == SlideLimits.Next:1206 elif self.isLive and self.slide_limits == SlideLimits.Next:
1207 self.serviceNext()1207 self.serviceNext()
1208 return1208 return
1209 else:1209 else:
@@ -1230,7 +1230,7 @@
1230 if row == -1:1230 if row == -1:
1231 if self.slide_limits == SlideLimits.Wrap:1231 if self.slide_limits == SlideLimits.Wrap:
1232 row = self.previewListWidget.rowCount() - 11232 row = self.previewListWidget.rowCount() - 1
1233 elif self.slide_limits == SlideLimits.Next:1233 elif self.isLive and self.slide_limits == SlideLimits.Next:
1234 self.keypress_queue.append(ServiceItemAction.PreviousLastSlide)1234 self.keypress_queue.append(ServiceItemAction.PreviousLastSlide)
1235 self._process_queue()1235 self._process_queue()
1236 return1236 return