# HG changeset patch
# User unc0rr
# Date 1404499559 -14400
# Node ID 4e919f7b9d9211e1eb5908b51beb53fc0daee8f2
# Parent  a51de45dcc42b986d64a33972beaed21887086e1
Don't pick up own team if only recieved synced teamback message. Fixes second rejoin desync (untested).

diff -r a51de45dcc42 -r 4e919f7b9d92 hedgewars/uTeams.pas
--- a/hedgewars/uTeams.pas	Wed Jul 02 23:55:00 2014 +0400
+++ b/hedgewars/uTeams.pas	Fri Jul 04 22:45:59 2014 +0400
@@ -704,12 +704,13 @@
                 AddChatString('** '+ TeamName + ' is back');
                 if not CurrentTeam^.ExtDriven then SendIPC(_S'g' + s);
                 hasGone:= false;
-                isGoneFlagPengingToBeUnset:= false;
 
                 RecountTeamHealth(TeamsArray[t]);
 
-                if Owner = UserNick then
-                    ExtDriven:= false
+                if isGoneFlagPengingToBeUnset and (Owner = UserNick) then
+                    ExtDriven:= false;
+
+                isGoneFlagPengingToBeUnset:= false;
                 end;
         end
     else