--- loncom/auth/switchserver.pm	2010/07/22 21:44:25	1.28
+++ loncom/auth/switchserver.pm	2010/08/13 00:06:27	1.28.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.28 2010/07/22 21:44:25 raeburn Exp $
+# $Id: switchserver.pm,v 1.28.2.1 2010/08/13 00:06:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,6 +59,7 @@ sub do_redirect {
     my $start_page = 
 	&Apache::loncommon::start_page('Switching Server ...',undef,
 				       {'redirect'       => [0.5,$url],
+                                        'no_inline_link' => 1,
 					'only_body'      => $only_body,});
     my $end_page   = &Apache::loncommon::end_page();
     $r->print($start_page.$extra_text.$end_page);
@@ -159,7 +160,10 @@ sub handler {
 	return OK;
     }
 # -------------------------------------------------------- Menu script and info
-	   
+
+    my $windowinfo=
+        &Apache::lonmenu::close().
+        &Apache::lonnavmaps::close();
 # ---------------------------------------------------------------- Get handover
 
     my %info=('ip'       => $ENV{'REMOTE_ADDR'},
@@ -186,7 +190,7 @@ sub handler {
 	'&token='.$token;
 # --------------------------------------------------------------- Screen Output
     &Apache::lonnet::flushcourselogs();
-    return &do_redirect($r, $url, 0);
+    return &do_redirect($r,$url,0,$windowinfo);
 }
 
 1;