]> git.sesse.net Git - vlc/commitdiff
mozilla: Use --ignore-config, we don't want local VLC to interfer with the plugin...
authorPierre d'Herbemont <pdherbemont@videolan.org>
Sat, 31 May 2008 13:27:53 +0000 (15:27 +0200)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Sat, 31 May 2008 13:28:23 +0000 (15:28 +0200)
projects/mozilla/vlcplugin.cpp

index 7a4e05b3002087fa2e58510aefacf914cb93fe06..1d6eb91d2b824c45dba5c52a487109f8a2617000 100644 (file)
@@ -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;
     }