raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'nov_fixes' into 'master'

Browse Source 
Two text fixes and a PDF startup error

Closes #695

See merge request openlp/openlp!269
This commit is contained in:
Tim Bentley 2020-11-20 14:26:38 +00:00
commit 7a4e3e9b85
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/display/screens.py
View File

@ -256,7 +256,7 @@ class ScreenList(metaclass=Singleton):
for number, screen_dict in screen_settings.items(): for number, screen_dict in screen_settings.items():
# Sometimes this loads as a string instead of an int # Sometimes this loads as a string instead of an int
number = int(number) number = int(number)
# Compare geometry, primarity of screen from settings with avilable screens # Compare geometry, primary of screen from settings with available screens
if self.has_screen(screen_dict): if self.has_screen(screen_dict):
# If match was found, we're all happy, update with custom geometry, display info, if available # If match was found, we're all happy, update with custom geometry, display info, if available
self[number].update(screen_dict) self[number].update(screen_dict)

2
openlp/plugins/presentations/presentationplugin.py
View File

@ -137,6 +137,8 @@ class PresentationPlugin(Plugin):
super().app_startup() super().app_startup()
presentation_paths = self.settings.value('presentations/presentations files') presentation_paths = self.settings.value('presentations/presentations files')
for path in presentation_paths: for path in presentation_paths:
# check to see if the file exists before trying to process it.
if path.exists():
self.media_item.clean_up_thumbnails(path, clean_for_update=True) self.media_item.clean_up_thumbnails(path, clean_for_update=True)
self.media_item.list_view.clear() self.media_item.list_view.clear()
# Update the thumbnail scheme if needed # Update the thumbnail scheme if needed