Index: Slim/Utils/Timers.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Utils/Timers.pm,v
retrieving revision 1.10
diff -u -p -B -r1.10 Timers.pm
--- Slim/Utils/Timers.pm	25 Aug 2004 23:24:46 -0000	1.10
+++ Slim/Utils/Timers.pm	16 Oct 2004 04:37:56 -0000
@@ -73,6 +73,20 @@ sub adjustAllTimers {
 	}
 }
 
+# Adjust an existing timer to fire at a new time.
+#
+sub resetTimer {
+	my $client = shift;
+	my $subptr = shift;
+	my $when = shift;
+	
+	foreach my $timer (@timers) {
+		if (($timer->{'client'} eq $client) && ($timer->{'subptr'} eq $subptr) ) {
+			$timer->{'when'} = $when;
+		}
+	}
+}
+
 #
 # Return the time until the next timer is set to go off, 0 if overdue
 # Return nothing if there are no timers
Index: Slim/Player/SqueezeboxG.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Player/SqueezeboxG.pm,v
retrieving revision 1.15
diff -u -p -B -r1.15 SqueezeboxG.pm
--- Slim/Player/SqueezeboxG.pm	25 Sep 2004 00:47:55 -0000	1.15
+++ Slim/Player/SqueezeboxG.pm	16 Oct 2004 04:37:56 -0000
@@ -388,14 +388,33 @@ sub showBriefly {
 	my $duration = shift;
 	my $firstLineIfDoubled = shift;
 	my @lines = [$line1,$line2];
-
-	$client->update(@lines);
+	
+	$client->killAnimation();
+	
+	my %line = (func => sub {return ($line1,$line2)});
+	my $linefunc  = $client->lines();
 
 	if (!$duration) {
 		$duration = 1;
 	}
 
-	Slim::Utils::Timers::setTimer($client,Time::HiRes::time() + $duration,\&update)
+	$client->lines(\&{$line{func}});
+	$client->update();
+	if (Slim::Utils::Timers::pendingTimers($client, \&showDone) > 0) {
+		Slim::Utils::Timers::resetTimer($client,\&showDone,Time::HiRes::time() + $duration);
+	} else {
+		Slim::Utils::Timers::setTimer($client,Time::HiRes::time() + $duration,\&showDone,$linefunc);
+	}
+}
+
+sub showDone {
+	my $client = shift;
+	my $linefunc = shift;
+	
+	if (defined $linefunc && &$linefunc($client) ne "") {
+			$client->lines($linefunc);
+	}
+	$client->update();
 }
 
 # push the old screen off the left side