Skip to content

V
vlc
Commit 6837daf3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

help module hack becomes even worst...

parent e93bed1a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
src/libvlc-common.c
View file @ 6837daf3
...@@ -305,7 +305,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -305,7 +305,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ) ) if( config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ) )
{ {
vlc_object_detach( p_help_module ); vlc_object_detach( p_help_module );
config_Free( p_help_module ); p_help_module->p_config = NULL;
p_help_module->confsize = 0;
vlc_object_destroy( p_help_module ); vlc_object_destroy( p_help_module );
module_EndBank( p_libvlc ); module_EndBank( p_libvlc );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -413,7 +414,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -413,7 +414,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
if( b_exit ) if( b_exit )
{ {
config_Free( p_help_module ); p_help_module->p_config = NULL; p_help_module->confsize = 0;
vlc_object_destroy( p_help_module ); vlc_object_destroy( p_help_module );
module_EndBank( p_libvlc ); module_EndBank( p_libvlc );
return i_ret; return i_ret;
...@@ -523,7 +524,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -523,7 +524,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
if( b_exit ) if( b_exit )
{ {
config_Free( p_help_module ); p_help_module->p_config = NULL; p_help_module->confsize = 0;
vlc_object_destroy( p_help_module ); vlc_object_destroy( p_help_module );
module_EndBank( p_libvlc ); module_EndBank( p_libvlc );
return i_ret; return i_ret;
...@@ -556,7 +557,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -556,7 +557,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
PauseConsole(); PauseConsole();
#endif #endif
vlc_object_detach( p_help_module ); vlc_object_detach( p_help_module );
config_Free( p_help_module ); p_help_module->p_config = NULL; p_help_module->confsize = 0;
vlc_object_destroy( p_help_module ); vlc_object_destroy( p_help_module );
module_EndBank( p_libvlc ); module_EndBank( p_libvlc );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -564,7 +565,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -564,7 +565,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
/* Hack: remove the help module here */ /* Hack: remove the help module here */
vlc_object_detach( p_help_module ); vlc_object_detach( p_help_module );
config_Free( p_help_module ); p_help_module->p_config = NULL; p_help_module->confsize = 0;
vlc_object_destroy( p_help_module ); vlc_object_destroy( p_help_module );
/* End hack */ /* End hack */
......
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