Merge branch 'fix-pdf-paths' into 'master'

Fix a traceback when trying to display a PDF

See merge request openlp/openlp!94
This commit is contained in:
Tomas Groth 2019-12-04 20:46:10 +00:00
commit 5cfce8c59b

View File

@ -310,7 +310,7 @@ class PresentationMediaItem(MediaManagerItem):
image_path = doc.get_temp_folder() / 'mainslide{number:0>3d}.png'.format(number=i) image_path = doc.get_temp_folder() / 'mainslide{number:0>3d}.png'.format(number=i)
thumbnail_path = doc.get_thumbnail_folder() / 'slide{number:d}.png'.format(number=i) thumbnail_path = doc.get_thumbnail_folder() / 'slide{number:d}.png'.format(number=i)
while image_path.is_file(): while image_path.is_file():
service_item.add_from_image(str(image_path), file_name, thumbnail=str(thumbnail_path)) service_item.add_from_image(image_path, file_name, thumbnail=str(thumbnail_path))
i += 1 i += 1
image_path = doc.get_temp_folder() / 'mainslide{number:0>3d}.png'.format(number=i) image_path = doc.get_temp_folder() / 'mainslide{number:0>3d}.png'.format(number=i)
thumbnail_path = doc.get_thumbnail_folder() / 'slide{number:d}.png'.format(number=i) thumbnail_path = doc.get_thumbnail_folder() / 'slide{number:d}.png'.format(number=i)