2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/plugins.c b/src/plugins/plugins.c
index a7aab152a..06b96b4fb 100644
--- a/src/plugins/plugins.c
+++ b/src/plugins/plugins.c
@@ -851,7 +851,7 @@ plugin_unload_all ()
  */
 
 void
-plugin_init ()
+plugin_init (int auto_load)
 {
     char *list_plugins, *pos, *pos2;
     
@@ -859,7 +859,7 @@ plugin_init ()
     plugin_config_read ();
     
     /* auto-load plugins if asked */
-    if (cfg_plugins_autoload && cfg_plugins_autoload[0])
+    if (auto_load && cfg_plugins_autoload && cfg_plugins_autoload[0])
     {
         if (ascii_strcasecmp (cfg_plugins_autoload, "*") == 0)
             plugin_auto_load ();
diff --git a/src/plugins/plugins.h b/src/plugins/plugins.h
index 25bb2f1e1..0adba8914 100644
--- a/src/plugins/plugins.h
+++ b/src/plugins/plugins.h
@@ -52,7 +52,7 @@ extern void plugin_remove (t_weechat_plugin *);
 extern void plugin_unload (t_weechat_plugin *);
 extern void plugin_unload_name (char *);
 extern void plugin_unload_all ();
-extern void plugin_init ();
+extern void plugin_init (int);
 extern void plugin_end ();
 
 #endif /* plugins.h */