equal
deleted
inserted
replaced
36 { |
36 { |
37 framePlaying->addTeam(team, true); |
37 framePlaying->addTeam(team, true); |
38 curPlayingTeams.push_back(team); |
38 curPlayingTeams.push_back(team); |
39 connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)), |
39 connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)), |
40 this, SLOT(hhNumChanged(const HWTeam&))); |
40 this, SLOT(hhNumChanged(const HWTeam&))); |
|
41 blockSignals(true); |
41 dynamic_cast<TeamShowWidget*>(framePlaying->getTeamWidget(team))->hhNumChanged(); |
42 dynamic_cast<TeamShowWidget*>(framePlaying->getTeamWidget(team))->hhNumChanged(); |
|
43 blockSignals(false); |
42 connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)), |
44 connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)), |
43 this, SLOT(proxyTeamColorChanged(const HWTeam&))); |
45 this, SLOT(proxyTeamColorChanged(const HWTeam&))); |
44 } |
46 } |
45 else |
47 else |
46 { |
48 { |
208 } |
210 } |
209 if(willBePlaying) |
211 if(willBePlaying) |
210 { |
212 { |
211 connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)), |
213 connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)), |
212 this, SLOT(hhNumChanged(const HWTeam&))); |
214 this, SLOT(hhNumChanged(const HWTeam&))); |
|
215 blockSignals(true); |
213 dynamic_cast<TeamShowWidget*>(framePlaying->getTeamWidget(team))->hhNumChanged(); |
216 dynamic_cast<TeamShowWidget*>(framePlaying->getTeamWidget(team))->hhNumChanged(); |
|
217 blockSignals(false); |
214 connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)), |
218 connect(framePlaying->getTeamWidget(team), SIGNAL(teamColorChanged(const HWTeam&)), |
215 this, SLOT(proxyTeamColorChanged(const HWTeam&))); |
219 this, SLOT(proxyTeamColorChanged(const HWTeam&))); |
216 emit teamColorChanged(((TeamShowWidget*)framePlaying->getTeamWidget(team))->getTeam()); |
220 emit teamColorChanged(((TeamShowWidget*)framePlaying->getTeamWidget(team))->getTeam()); |
217 } |
221 } |
218 |
222 |