Commit 5982dfbd authored by Sam Hocevar's avatar Sam Hocevar

* ./include/modules_inner.h: fixed a bug in module reinitialization,

    which should fix crashes after a long pause.
parent 3286de8c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* modules.h : Module management functions. * modules.h : Module management functions.
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: modules.h,v 1.48 2002/04/24 00:36:24 sam Exp $ * $Id: modules.h,v 1.49 2002/05/15 00:02:27 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
*****************************************************************************/ *****************************************************************************/
/* Number of tries before we unload an unused module */ /* Number of tries before we unload an unused module */
#define MODULE_HIDE_DELAY 10000 #define MODULE_HIDE_DELAY 50
#define MODULE_SHORTCUT_MAX 10 #define MODULE_SHORTCUT_MAX 10
/* The module handle type. */ /* The module handle type. */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* modules_inner.h : Macros used from within a module. * modules_inner.h : Macros used from within a module.
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: modules_inner.h,v 1.18 2002/05/03 20:49:30 sam Exp $ * $Id: modules_inner.h,v 1.19 2002/05/15 00:02:27 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -144,7 +144,6 @@ ...@@ -144,7 +144,6 @@
#define MODULE_ACTIVATE_START \ #define MODULE_ACTIVATE_START \
int __VLC_SYMBOL( ActivateModule ) ( module_t *p_module ) \ int __VLC_SYMBOL( ActivateModule ) ( module_t *p_module ) \
{ \ { \
config_SetCallbacks( p_module->p_config, p_config ); \
p_module->p_functions = \ p_module->p_functions = \
( module_functions_t * )malloc( sizeof( module_functions_t ) ); \ ( module_functions_t * )malloc( sizeof( module_functions_t ) ); \
if( p_module->p_functions == NULL ) \ if( p_module->p_functions == NULL ) \
...@@ -152,6 +151,7 @@ ...@@ -152,6 +151,7 @@
return( -1 ); \ return( -1 ); \
} \ } \
STORE_SYMBOLS; \ STORE_SYMBOLS; \
config_SetCallbacks( p_module->p_config, p_config ); \
do { do {
#define MODULE_ACTIVATE_STOP \ #define MODULE_ACTIVATE_STOP \
......
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