X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite-irssi.pl;h=390e26c3fd96eeb9ce328680a371bc7e6ecaac46;hb=4d0981a45ce2331721226a9c3fc154a82d7fc7fa;hp=3db9af162f8c994e2c211d422af9db2f570610ef;hpb=958d41cb7f0bebd3a0ed2533af2ffbef07bf272b;p=videosite.git

diff --git a/videosite-irssi.pl b/videosite-irssi.pl
index 3db9af1..390e26c 100644
--- a/videosite-irssi.pl
+++ b/videosite-irssi.pl
@@ -233,17 +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 $_ },
+        reload => \&videosite_reset,
         _debug => sub { 1 },
     })) {
         Irssi::print(sprintf("videosite API register failed: %s", $libvideosite::error));
@@ -259,11 +276,6 @@ 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(@_) });