# HG changeset patch # User Wuzzy # Date 1507396285 -7200 # Node ID 2e0a38566178cbc7bd1feeb4a88ccff78eec680d # Parent 1d25f5555c38446bc5b5b685cc0261595e333ba8 Make sure new teams start with an unique name diff -r 1d25f5555c38 -r 2e0a38566178 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Sat Oct 07 18:43:31 2017 +0200 +++ b/QTfrontend/hwform.cpp Sat Oct 07 19:11:25 2017 +0200 @@ -1036,7 +1036,16 @@ void HWForm::NewTeam() { - ui.pageEditTeam->createTeam(QLineEdit::tr("unnamed"), playerHash); + QString teamName = QLineEdit::tr("unnamed"); + QStringList teamslist = config->GetTeamsList(); + if(teamslist.contains(teamName)) + { + //name already used -> look for an appropriate name: + int i=2; + while(teamslist.contains(teamName = QLineEdit::tr("unnamed (%1)").arg(i++))); + } + + ui.pageEditTeam->createTeam(teamName, playerHash); UpdateTeamsLists(); GoToPage(ID_PAGE_SETUP_TEAM); } diff -r 1d25f5555c38 -r 2e0a38566178 share/hedgewars/Data/Locale/hedgewars_de.ts --- a/share/hedgewars/Data/Locale/hedgewars_de.ts Sat Oct 07 18:43:31 2017 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_de.ts Sat Oct 07 19:11:25 2017 +0200 @@ -2861,6 +2861,10 @@ anonymous anonym + + unnamed (%1) + unbenannt (%1) + QMainWindow diff -r 1d25f5555c38 -r 2e0a38566178 share/hedgewars/Data/Locale/hedgewars_en.ts --- a/share/hedgewars/Data/Locale/hedgewars_en.ts Sat Oct 07 18:43:31 2017 +0200 +++ b/share/hedgewars/Data/Locale/hedgewars_en.ts Sat Oct 07 19:11:25 2017 +0200 @@ -2699,6 +2699,10 @@ anonymous anonymous + + unnamed (%1) + unnamed (%1) + QMainWindow