Merge branch '30rc1-fixes' into 'master'

A few bug fixes

Closes #958

See merge request openlp/openlp!382

openlp/core/ui/serviceitemeditform.py

@@ -62,7 +62,9 @@ class ServiceItemEditForm(QtWidgets.QDialog, Ui_ServiceItemEditDialog, RegistryP
             # self.data is only true for images
             self.item.slides = []
             for item in self.item_list:
-                self.item.add_from_image(item['path'], item['title'])
+                thumb = item.get('thumbnail', None)
+                file_hash = item.get('file_hash', None)
+                self.item.add_from_image(item['path'], item['title'], thumb, file_hash)
         return self.item
 
     def load_data(self):

openlp/core/ui/servicemanager.py

@@ -762,8 +762,12 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi
         """
         # If the file_path is a string, this method will fail. Typecase to Path
         file_path = Path(file_path)
+        try:
             if not file_path.exists():
                 return False
+        except OSError:
+            # if the filename, directory name, or volume label syntax is incorrect it can cause an exception
+            return False
         service_data = None
         self.application.set_busy_cursor()
         try:

tests/openlp_core/ui/test_serviceitemeditform.py

@@ -84,8 +84,8 @@ def test_get_service_item(form):
     assert item is form.item, 'The returned item should be form.item'
     # FYI: list should be empty because it was cleared but never filled again due to the mock
     assert item.slides == [], 'The list of slides should have been cleared'
-    assert item.add_from_image.call_args_list == [call('../slide1.jpg', 'slide1.jpg'),
-                                                  call('../slide2.jpg', 'slide2.jpg')]
+    assert item.add_from_image.call_args_list == [call('../slide1.jpg', 'slide1.jpg', None, None),
+                                                  call('../slide2.jpg', 'slide2.jpg', None, None)]
 
 
 @patch('openlp.core.ui.serviceitemeditform.QtWidgets.QListWidgetItem')