Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None

openlp/core/ui/media/mediacontroller.py

@@ -515,7 +515,7 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
         :param service_item: The ServiceItem containing the details to be played.
         """
         used_players = get_media_players()[0]
-        if service_item.processor != UiStrings().Automatic:
+        if service_item.processor and service_item.processor != UiStrings().Automatic:
             used_players = [service_item.processor.lower()]
         # If no player, we can't play
         if not used_players:

openlp/plugins/media/lib/mediaitem.py

@@ -34,6 +34,7 @@ from openlp.core.ui import DisplayController, Display, DisplayControllerType
 from openlp.core.ui.media import get_media_players, set_media_players, parse_optical_path, format_milliseconds
 from openlp.core.utils import get_locale_key
 from openlp.core.ui.media.vlcplayer import get_vlc
+
 if get_vlc() is not None:
     from openlp.plugins.media.forms.mediaclipselectorform import MediaClipSelectorForm
 
@@ -412,7 +413,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
         When the load optical button is clicked, open the clip selector window.
         """
         # self.media_clip_selector_form.exec_()
-        if VLC_AVAILABLE:
+        if get_vlc():
             media_clip_selector_form = MediaClipSelectorForm(self, self.main_window, None)
             media_clip_selector_form.exec_()
             del media_clip_selector_form