X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Ftalk.pl;h=4adeb7261355b3411c40f677b7ec14feed5c8aa0;hb=8e14149148baba63ce5ae2b95aacda8ab6dd0d87;hp=942dac72dbeb015ceef56ab0b8e704a50413cf94;hpb=201dedf3e4325faab5c34b38135790012142286b;p=spider.git

diff --git a/cmd/show/talk.pl b/cmd/show/talk.pl
index 942dac72..4adeb726 100644
--- a/cmd/show/talk.pl
+++ b/cmd/show/talk.pl
@@ -25,7 +25,10 @@ while ($f = shift @f) {                 # next field
 		next if $to;
 	}
 	next if $who;
-	($who) = $f =~ /^(\w+)/o;
+	if ($f !~ /^\d+/) {
+		($who) = $f;
+	}
+#	($who) = $f =~ /^(\w+)/o;
 }
 
 $to = 20 unless $to;
@@ -35,7 +38,5 @@ if ($self->priv < 6) {
 	return (1, $self->msg('e5')) if $who ne $self->call;
 }
 
-@out = $self->spawn_cmd("show/talk $cmdline", \&DXLog::print, args => [$from, $to, $main::systime, 'talk', $who]);
-	
-#@out = DXLog::print($from, $to, $main::systime, 'talk', $who);
-return (1, @out);
+return (1, DXLog::print($from, $to, $main::systime, 'talk', $who)) if ($self->{_nospawn} || $main::is_win == 1);
+return (1, $self->spawn_cmd("show/talk $cmdline", \&DXLog::print, args => [$from, $to, $main::systime, 'talk', $who]));