From 7badbca8cf96132c2e187654b1774ad32f82bcae Mon Sep 17 00:00:00 2001 From: Phill Ridout Date: Wed, 22 Nov 2017 20:21:57 +0000 Subject: [PATCH] Pathfixes --- openlp/plugins/media/forms/mediaclipselectorform.py | 3 ++- openlp/plugins/media/lib/mediaitem.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/media/forms/mediaclipselectorform.py b/openlp/plugins/media/forms/mediaclipselectorform.py index af08870df..2bbb5fcdf 100644 --- a/openlp/plugins/media/forms/mediaclipselectorform.py +++ b/openlp/plugins/media/forms/mediaclipselectorform.py @@ -28,6 +28,7 @@ from datetime import datetime from PyQt5 import QtCore, QtGui, QtWidgets from openlp.core.common import is_win, is_linux, is_macosx +from openlp.core.common.path import Path from openlp.core.common.i18n import translate from openlp.core.common.mixins import RegistryProperties from openlp.plugins.media.forms.mediaclipselectordialog import Ui_MediaClipSelector @@ -615,7 +616,7 @@ class MediaClipSelectorForm(QtWidgets.QDialog, Ui_MediaClipSelector, RegistryPro break # Append the new name to the optical string and the path optical += new_optical_name + ':' + path - self.media_item.add_optical_clip(optical) + self.media_item.add_optical_clip(Path(optical)) def media_state_wait(self, media_state): """ diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index e47ed70e0..99454ff13 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -455,5 +455,5 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): return # Append the optical string to the media list file_paths.append(optical) - self.load_list([optical]) + self.load_list([str(optical)]) Settings().setValue(self.settings_section + '/media files', file_paths)