Win32: (restore) support for Unicode command line...

[vlc] / modules / control / lirc.c

diff --git a/modules/control/lirc.c b/modules/control/lirc.c
index 88eb631fe3597977e1be62248bfad9eb6d46f2e9..de500e10972c8e68254c0c43df98e9aa58de7c20 100644 (file)
--- a/modules/control/lirc.c
+++ b/modules/control/lirc.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_osd.h>
@@ -98,6 +98,7 @@ static int Open( vlc_object_t *p_this )
     if( i_fd == -1 )
     {
         msg_Err( p_intf, "lirc initialisation failed" );
+        free( p_intf->p_sys->psz_file );
         free( p_intf->p_sys );
         return 1;
     }
@@ -109,6 +110,7 @@ static int Open( vlc_object_t *p_this )
     {
         msg_Err( p_intf, "failure while reading lirc config" );
         lirc_deinit();
+        free( p_intf->p_sys->psz_file );
         free( p_intf->p_sys );
         return 1;
     }
@@ -184,7 +186,7 @@ static void Run( intf_thread_t *p_intf )
                     osd_MenuActivate( VLC_OBJECT(p_intf) );
                 else
                 {
-                    msg_Err( p_intf, _("Please provide one of the following parameters:") );
+                    msg_Err( p_intf, "Please provide one of the following parameters:" );
                     msg_Err( p_intf, "[on|off|up|down|left|right|select]" );
                     break;
                 }