Changeset 69c3878 for perl/modules/IRC/lib/BarnOwl/Module/IRC.pm

Timestamp:

Oct 10, 2009, 9:24:27 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

dcc3f80

Parents:

e1e59a7 (diff), 7cfb1df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'irc'

File:

• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (1 diff)

perl/modules/IRC/lib/BarnOwl/Module/IRC.pm

@@ -545 +545 @@
             $conn = get_connection_by_alias($alias);
         }
-        if(!$conn && $use_channel) {
+        if($use_channel) {
             $channel = $ARGV[0];
             if(defined($channel) && $channel =~ /^#/) {
                 if($channels{$channel} && @{$channels{$channel}} == 1) {
                     shift @ARGV;
-                    $conn = $channels{$channel}[0];
-                }  
+                    $conn = $channels{$channel}[0] unless $conn;
+                }
+            } elsif ($m && $m->type eq 'IRC' && !$m->is_private) {
+                $channel = $m->channel;
             } else {
-                if($m && $m->type eq 'IRC' && !$m->is_private) {
-                    $channel = $m->channel;
-                } else {
-                    undef $channel;
-                }
+                undef $channel;
             }
         }
+
         if(!$channel && $use_channel == REQUIRE_CHANNEL) {
             die("Usage: $cmd <channel>\n");