[vlc-devel] commit: Don't start the file logger when syslog is specified. ( Jean-Paul Saman )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Mon Oct  6 16:21:40 2008 +0200| [71e3f2f1759442e3b1e7e296ec27ca19b91ca219] | committer: Jean-Paul Saman 

Don't start the file logger when syslog is specified.

If --syslog is specified on the commandline then vlc loads the logger in file mode first, because --file-logging is the default. This is counter intuitive for users, they expect *only* syslog mode to be active. Note that the logger module can only have one mode active at the sametime, either html, text or syslog.
(cherry picked from commit 5e2f7b2f90dbab0488d62557ba59159925a88e3a)

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

 src/libvlc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/libvlc.c b/src/libvlc.c
index c111ea9..ead45da 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -858,7 +858,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     }
 #endif
 
-    if( config_GetInt( p_libvlc, "file-logging" ) > 0 )
+    if( (config_GetInt( p_libvlc, "file-logging" ) > 0) &&
+        !config_GetInt( p_libvlc, "syslog" ) )
     {
         libvlc_InternalAddIntf( p_libvlc, "logger,none" );
     }