[SimBot-commits] CVS: simbot simbot.pl,1.114,1.115

[Kevin S. <ks...@us...>]

Update of /cvsroot/simbot/simbot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1647

Modified Files:
	simbot.pl 
Log Message:
Currency was failing to load and yet, the plugin was still registered, because
the code was ordered badly. :)

Index: simbot.pl
===================================================================
RCS file: /cvsroot/simbot/simbot/simbot.pl,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -p -r1.114 -r1.115
--- simbot.pl	5 May 2005 03:29:39 -0000	1.114
+++ simbot.pl	10 May 2005 02:25:57 -0000	1.115
@@ -824,6 +824,12 @@ sub plugin_register {
     } else {
 		die("$data{plugin_id}: a plugin is already registered to this handle");
     }
+    if ($data{event_plugin_load}) {
+		if (!&plugin_callback($data{plugin_id}, $data{event_plugin_load})) {
+			die("$data{plugin_id}: the plugin returned an error on load");
+		}
+
+    }
     $event_plugin_call{$data{plugin_id}} = $data{event_plugin_call};
     if(!$data{plugin_help}) {
 		&debug(5, $data{plugin_id} . ": this plugin has no help text and will be hidden\n");
@@ -831,12 +837,6 @@ sub plugin_register {
 		$plugin_help{$data{plugin_id}} = $data{plugin_help};
     }
 	$plugin_params{$data{plugin_id}} = $data{plugin_params};
-    if ($data{event_plugin_load}) {
-		if (!&plugin_callback($data{plugin_id}, $data{event_plugin_load})) {
-			die("$data{plugin_id}: the plugin returned an error on load");
-		}
-
-    }
     foreach (keys(%data)) {
 		if ($_ =~ /^event_(plugin|bot|channel|private|server)_.*/) {
 			$$_{$data{plugin_id}} = $data{$_};