[vlc-devel] commit: mozilla: Use --ignore-config, we don' t want local VLC to interfer with the plugin. Also support exception. ( Pierre d'Herbemont )

[git version control]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Sat May 31 15:27:53 2008 +0200| [07f363a4228870c2210957ad202635ad1dc45e4d]

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=07f363a4228870c2210957ad202635ad1dc45e4d
---

 projects/mozilla/vlcplugin.cpp |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index 7a4e05b..1d6eb91 100644
--- a/projects/mozilla/vlcplugin.cpp
+++ b/projects/mozilla/vlcplugin.cpp
@@ -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;
     }