From 26e72a1fecf1ea0e7ffc35d11bd279eef44109b9 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Thu, 5 May 2016 20:17:45 +0200 Subject: [PATCH] make mediainfo detection work on win and mac. --- openlp/plugins/media/mediaplugin.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py index e258b5809..f9874c57b 100644 --- a/openlp/plugins/media/mediaplugin.py +++ b/openlp/plugins/media/mediaplugin.py @@ -71,8 +71,12 @@ class MediaPlugin(Plugin): :return: true or false """ log.debug('check_installed Mediainfo') - # Use the user defined program if given - return process_check_binary('mediainfo') + # Try to find mediainfo in the path + exists = process_check_binary('mediainfo') + # If mediainfo is not in the path, try to find it in the application folder + if not exists: + exists = process_check_binary(os.path.join(AppLocation.get_directory(AppLocation.AppDir), 'mediainfo')) + return exists def app_startup(self): """