From f51f19e2b9032e29e235b8deec96c8f40d5bbdf2 Mon Sep 17 00:00:00 2001 From: Martin Zibricky Date: Sat, 15 Sep 2012 13:09:59 +0200 Subject: [PATCH] Fix #963894: expect also OSError while checking for media backends. --- openlp/core/ui/media/mediacontroller.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 5e9671f64..3ce38540c 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -114,7 +114,9 @@ class MediaController(object): log.debug(u'Importing controller %s', modulename) try: __import__(modulename, globals(), locals(), []) - except ImportError: + # On some platforms importing vlc.py might cause + # also OSError exception. (e.g. Mac OS X) + except (ImportError, OSError): log.warn(u'Failed to import %s on path %s', modulename, path) controller_classes = MediaPlayer.__subclasses__()