openlp-core team mailing list archive

[Jonathan Stafford <staffj01@xxxxxxxxx>]

Jonathan Stafford has proposed merging lp:~staffj01/openlp/bug-932610 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #932610 in OpenLP: "Preview crashes when "Service Item Slide Limits" is set to "Next Item""
  https://bugs.launchpad.net/openlp/+bug/932610

For more details, see:
https://code.launchpad.net/~staffj01/openlp/bug-932610/+merge/93179

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.
-- 
https://code.launchpad.net/~staffj01/openlp/bug-932610/+merge/93179
Your team OpenLP Core is requested to review the proposed merge of lp:~staffj01/openlp/bug-932610 into lp:openlp.

=== 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 @@
                 if wrap is None:
                     if self.slide_limits == SlideLimits.Wrap:
                         row = 0
-                    elif self.slide_limits == SlideLimits.Next:
+                    elif self.isLive and self.slide_limits == SlideLimits.Next:
                         self.serviceNext()
                         return
                     else:
@@ -1230,7 +1230,7 @@
             if row == -1:
                 if self.slide_limits == SlideLimits.Wrap:
                     row = self.previewListWidget.rowCount() - 1
-                elif self.slide_limits == SlideLimits.Next:
+                elif self.isLive and self.slide_limits == SlideLimits.Next:
                     self.keypress_queue.append(ServiceItemAction.PreviousLastSlide)
                     self._process_queue()
                     return