Commit 07f363a4 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files

mozilla: Use --ignore-config, we don't want local VLC to interfer with the...

mozilla: Use --ignore-config, we don't want local VLC to interfer with the plugin. Also support exception.
parent 71d7c0d4
......@@ -109,6 +109,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
ppsz_argv[ppsz_argc++] = "-vv";
ppsz_argv[ppsz_argc++] = "--no-stats";
ppsz_argv[ppsz_argc++] = "--no-media-library";
ppsz_argv[ppsz_argc++] = "--ignore-config";
ppsz_argv[ppsz_argc++] = "--intf";
ppsz_argv[ppsz_argc++] = "dummy";
......@@ -173,10 +174,13 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
}
libvlc_exception_t ex;
libvlc_exception_init(&ex);
libvlc_instance = libvlc_new(ppsz_argc, ppsz_argv, NULL);
if( ! libvlc_instance )
libvlc_instance = libvlc_new(ppsz_argc, ppsz_argv, &ex);
if( libvlc_exception_raised(&ex) )
{
libvlc_exception_clear(&ex);
return NPERR_GENERIC_ERROR;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment