=== modified file 'src/tron/gTeam.cpp'
--- src/tron/gTeam.cpp	2008-04-29 19:44:30 +0000
+++ src/tron/gTeam.cpp	2009-01-16 21:44:26 +0000
@@ -161,7 +161,7 @@
 
     virtual void Enter()
     {
-        player->SetTeamWish(NULL);
+        SetSpectator( player, true );
         menu->Exit();
     }
 };
@@ -261,9 +261,9 @@
             items[ items.Len() ] = tNEW( gMenuItemSpectate ) ( &playerMenu, player );
         }
 
-        if ( player->NextTeam()!=NULL)
+        if ( player->NextTeam()!=NULL && player->IsSpectating() )
         {
-            items[items.Len()] = tNEW(gMenuItemSpectate) (&playerMenu, player);
+            items[ items.Len() ] = tNEW( gMenuItemSpectate ) ( &playerMenu, player );
         }
 
         // first pass add teams who probably can't be joined