X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite-irssi.pl;h=30d462ae68dcf3a8a43a428d21a68092fbf4a8d6;hb=f9c997ac49bfdcd65ee89127f4d806e813355d8c;hp=f5c6ef1ee2ef4726d69484278fccfb4dc7a7c093;hpb=6a9455d53fe12634ee4b587a3ed1a9d13e66e2e7;p=videosite.git

diff --git a/videosite-irssi.pl b/videosite-irssi.pl
index f5c6ef1..30d462a 100644
--- a/videosite-irssi.pl
+++ b/videosite-irssi.pl
@@ -233,18 +233,34 @@ sub message_hook {
 }
 
 sub videosite_reset {
+    my $libpath;
+
+    # Find out the script directory, and add it to @INC.
+    # This is necessary to find libvideosite.pm
+    $libpath = File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts');
+
+    # If the library is already loaded unload it
+    foreach (keys(%INC)) {
+        if ($INC{$_} eq File::Spec->catfile($libpath, 'libvideosite.pm')) {
+            delete($INC{$_});
+        }
+    }
+
+    push(@INC, $libpath);
+    load 'libvideosite';
+
     unless(libvideosite::register_api({
         io => sub { Irssi::print($_[0]) },
         config_init => \&config_init,
         config_get =>  \&config_get,
         config_set => \&config_set,
         config_has => \&config_has,
-        config_save => \&config_save,
+        config_save => sub { 1 },
         config_del => \&config_del,
         color => \&colorpair,
         module_path => sub { return File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts') },
         quote => sub { s/%/%%/g; return $_ },
-        _debug => sub { 1 },
+        reload => \&videosite_reset,
     })) {
         Irssi::print(sprintf("videosite API register failed: %s", $libvideosite::error));
         return 0;
@@ -259,16 +275,11 @@ sub videosite_reset {
 }
 
 sub videosite_init {
-    # Find out the script directory, and add it to @INC.
-    # This is necessary to find libvideosite.pm
-
-    push(@INC, File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts'));
-    load 'libvideosite';
 
     if (videosite_reset()) {
         signal_add_last("message public", sub { message_hook(@_) });
         signal_add_last("message own_public", sub { message_hook($_[0], $_[1], undef, undef, $_[2]) });
-        signal_add_last("message private", sub { message_hooK($_[0], $_[1], $_[2], $_[3], $_[2]) });
+        signal_add_last("message private", sub { message_hook($_[0], $_[1], $_[2], $_[3], $_[2]) });
         signal_add_last("message own_private", sub { message_hook($_[0], $_[1], undef, undef, $_[2]) });
         signal_add_last("message irc action", sub { message_hook(@_) });
         signal_add_last("message irc own_action", sub { message_hook($_[0], $_[1], undef, undef, $_[2]) });