--- a/QTfrontend/hwform.cpp	Sun Apr 19 15:44:47 2009 +0000
+++ b/QTfrontend/hwform.cpp	Mon Apr 20 15:36:36 2009 +0000
@@ -345,7 +345,10 @@
 		  if (editedTeam) {
 		    curTeamSelWidget->addTeam(*editedTeam);
 		  }
-		} else if(lastid != ID_PAGE_GAMESTATS && lastid != ID_PAGE_INGAME && lastid != ID_PAGE_SCHEME) {
+		} else if(lastid != ID_PAGE_GAMESTATS
+				&& lastid != ID_PAGE_INGAME
+				&& lastid != ID_PAGE_SCHEME
+				&& lastid != ID_PAGE_SELECTWEAPON) {
 			curTeamSelWidget->resetPlayingTeams(teamsList);
 		}
 	} else