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

    which should fix crashes after a long pause.

diff --git a/include/modules.h b/include/modules.h
index 7638f7fafea8ad6062898342d0bce2945b6e9f5b..3fbc2745b10491eac16f718272d4b09f18e44bda 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -2,7 +2,7 @@
  * modules.h : Module management functions.
  *****************************************************************************
  * 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>
  *
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 /* Number of tries before we unload an unused module */
-#define MODULE_HIDE_DELAY 10000
+#define MODULE_HIDE_DELAY 50
 #define MODULE_SHORTCUT_MAX 10
 
 /* The module handle type. */

diff --git a/include/modules_inner.h b/include/modules_inner.h
index f66dee6cc3565b0a0aaaded2fe6c342bcbe54b42..210bb1f4a26a17e86a7da8a881a922af0a4eba0f 100644 (file)
--- a/include/modules_inner.h
+++ b/include/modules_inner.h
@@ -2,7 +2,7 @@
  * modules_inner.h : Macros used from within a module.
  *****************************************************************************
  * 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>
  *
@@ -144,7 +144,6 @@
 #define MODULE_ACTIVATE_START                                                 \
     int __VLC_SYMBOL( ActivateModule ) ( module_t *p_module )                 \
     {                                                                         \
-        config_SetCallbacks( p_module->p_config, p_config );                  \
         p_module->p_functions =                                               \
           ( module_functions_t * )malloc( sizeof( module_functions_t ) );     \
         if( p_module->p_functions == NULL )                                   \
@@ -152,6 +151,7 @@
             return( -1 );                                                     \
         }                                                                     \
         STORE_SYMBOLS;                                                        \
+        config_SetCallbacks( p_module->p_config, p_config );                  \
         do {
 
 #define MODULE_ACTIVATE_STOP                                                  \