From 1f9d00f47c27da2d1280d293f1c70eac369ff23c Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 11 Apr 2018 09:37:28 -0700 Subject: [PATCH] Fix non-song text items not updating the display (missing verse tags, essentially) --- openlp/core/lib/serviceitem.py | 5 ++++- openlp/core/ui/slidecontroller.py | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 22c9cf816..a621cbfa0 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -35,7 +35,7 @@ from openlp.core.common import md5_hash from openlp.core.common.applocation import AppLocation from openlp.core.common.i18n import translate from openlp.core.common.mixins import RegistryProperties -from openlp.core.common.path import Path, path_to_str +from openlp.core.common.path import Path from openlp.core.common.settings import Settings # from openlp.core.display.render import remove_tags, render_tags, render_chords from openlp.core.lib import ImageSource, build_icon @@ -321,6 +321,9 @@ class ServiceItem(RegistryProperties): """ if verse_tag: verse_tag = verse_tag.upper() + else: + # For items that don't have a verse tag, autoincrement the slide numbers + verse_tag = str(len(self.slides)) self.service_item_type = ServiceItemType.Text title = text[:30].split('\n')[0] self.slides.append({'title': title, 'text': text, 'verse': verse_tag}) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index f88b785f8..3204af25d 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -1174,8 +1174,6 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties): self.slide_preview.setPixmap(self.slide_image) else: self.preview_display.go_to_slide(self.selected_row) - for display in self.displays: - display.go_to_slide(self.selected_row) self.slide_count += 1 def grab_maindisplay(self):