git://git.camperquake.de
/
xmlrtorrent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
load submodule config on startup
[xmlrtorrent.git]
/
xmlrtorrent.pl
diff --git
a/xmlrtorrent.pl
b/xmlrtorrent.pl
index
460d9b3
..
0f50ba9
100644
(file)
--- a/
xmlrtorrent.pl
+++ b/
xmlrtorrent.pl
@@
-321,13
+321,13
@@
sub cmd_talker {
foreach $p (@talkers) {
if (($p->{'NAME'} eq $target) && ($p->{'TYPE'} eq 'talker')) {
$talker = $p;
foreach $p (@talkers) {
if (($p->{'NAME'} eq $target) && ($p->{'TYPE'} eq 'talker')) {
$talker = $p;
- $conf->{'
videosite
'}->{'talker'} = $target;
+ $conf->{'
xmlrtorrent
'}->{'talker'} = $target;
return;
}
}
write_irssi('No such talker');
} else {
return;
}
}
write_irssi('No such talker');
} else {
- write_irssi('Current talker: %s', $conf->{'
videosite
'}->{'talker'});
+ write_irssi('Current talker: %s', $conf->{'
xmlrtorrent
'}->{'talker'});
}
}
}
}
@@
-429,8
+429,12
@@
sub init_xmlrtorrent {
}
}
write_debug('Selected %s as talker', $talker->{'NAME'});
}
}
write_debug('Selected %s as talker', $talker->{'NAME'});
- $conf->{'
videosite
'}->{'talker'} = $talker->{'NAME'};
+ $conf->{'
xmlrtorrent
'}->{'talker'} = $talker->{'NAME'};
+ # Loop through all plugins and load the config
+ foreach $p (@talkers) {
+ $conf->{'xmlrtorrent'}->{'config'}->{$p->{'NAME'}} = $p->mergeconfig($conf->{'xmlrtorrent'}->{'config'}->{$p->{'NAME'}});
+ }
# Restore the queue
%torrentlist = %{$conf->{'xmlrtorrent'}->{'_QUEUE'}};
# Restore the queue
%torrentlist = %{$conf->{'xmlrtorrent'}->{'_QUEUE'}};