forked from openlp/openlp
Slide counts can only be got if active
This commit is contained in:
parent
4c1fe14fd2
commit
9f5ed9589b
@ -171,16 +171,18 @@ class Controller(object):
|
|||||||
if not self.is_live:
|
if not self.is_live:
|
||||||
return
|
return
|
||||||
if self.hide_mode:
|
if self.hide_mode:
|
||||||
|
if not self.doc.is_active():
|
||||||
|
return
|
||||||
if self.doc.slidenumber < self.doc.get_slide_count():
|
if self.doc.slidenumber < self.doc.get_slide_count():
|
||||||
self.doc.slidenumber = self.doc.slidenumber + 1
|
self.doc.slidenumber = self.doc.slidenumber + 1
|
||||||
return
|
return
|
||||||
|
if not self.activate():
|
||||||
|
return
|
||||||
# The "End of slideshow" screen is after the last slide
|
# The "End of slideshow" screen is after the last slide
|
||||||
# Note, we can't just stop on the last slide, since it may
|
# Note, we can't just stop on the last slide, since it may
|
||||||
# contain animations that need to be stepped through.
|
# contain animations that need to be stepped through.
|
||||||
if self.doc.slidenumber > self.doc.get_slide_count():
|
if self.doc.slidenumber > self.doc.get_slide_count():
|
||||||
return
|
return
|
||||||
if not self.activate():
|
|
||||||
return
|
|
||||||
self.doc.next_step()
|
self.doc.next_step()
|
||||||
self.doc.poll_slidenumber(self.is_live)
|
self.doc.poll_slidenumber(self.is_live)
|
||||||
|
|
||||||
@ -194,6 +196,8 @@ class Controller(object):
|
|||||||
if not self.is_live:
|
if not self.is_live:
|
||||||
return
|
return
|
||||||
if self.hide_mode:
|
if self.hide_mode:
|
||||||
|
if not self.doc.is_active():
|
||||||
|
return
|
||||||
if self.doc.slidenumber > 1:
|
if self.doc.slidenumber > 1:
|
||||||
self.doc.slidenumber = self.doc.slidenumber - 1
|
self.doc.slidenumber = self.doc.slidenumber - 1
|
||||||
return
|
return
|
||||||
|
Loading…
Reference in New Issue
Block a user