openlp-core team mailing list archive

[Tomas Groth <tomasgroth@xxxxxxxx>]

Tomas Groth has proposed merging lp:~tomasgroth/openlp/vlc-win-fix into lp:openlp/2.2.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/vlc-win-fix/+merge/275557

Implement a workaround for a PyInstaller 3.0 bug to load vlc.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~tomasgroth/openlp/vlc-win-fix into lp:openlp/2.2.

=== modified file 'openlp/core/ui/media/vendor/vlc.py'
--- openlp/core/ui/media/vendor/vlc.py	2015-09-03 19:11:08 +0000
+++ openlp/core/ui/media/vendor/vlc.py	2015-10-23 17:27:00 +0000
@@ -107,6 +107,7 @@
         except OSError:  # may fail
             dll = ctypes.CDLL('libvlc.so.5')
     elif sys.platform.startswith('win'):
+        ctypes.windll.kernel32.SetDllDirectoryW(None)
         p = find_library('libvlc.dll')
         if p is None:
             try:  # some registry settings