--- a/QTfrontend/team.cpp	Mon Oct 12 13:56:07 2009 +0000
+++ b/QTfrontend/team.cpp	Mon Oct 12 16:44:30 2009 +0000
@@ -214,7 +214,7 @@
 
 	for(int i = 0; i < BINDS_NUMBER; i++)
 	{
-		hwform->ui.pageEditTeam->CBBind[i]->setCurrentIndex(hwform->ui.pageEditTeam->CBBind[i]->findText(binds[i].strbind));
+		hwform->ui.pageEditTeam->CBBind[i]->setCurrentIndex(hwform->ui.pageEditTeam->CBBind[i]->findData(binds[i].strbind));
 	}
 }
 
@@ -233,7 +233,7 @@
 	Voicepack = hwform->ui.pageEditTeam->CBVoicepack->currentText();
 	for(int i = 0; i < BINDS_NUMBER; i++)
 	{
-		binds[i].strbind = hwform->ui.pageEditTeam->CBBind[i]->currentText();
+		binds[i].strbind = hwform->ui.pageEditTeam->CBBind[i]->itemData(hwform->ui.pageEditTeam->CBBind[i]->currentIndex()).toString();
 	}
 }
 
@@ -251,7 +251,8 @@
 
 	if (!m_isNetTeam)
 		for(int i = 0; i < BINDS_NUMBER; i++)
-			sl.push_back(QString("ebind " + binds[i].strbind + " " + binds[i].action));
+			if(!binds[i].strbind.isEmpty())
+				sl.push_back(QString("ebind " + binds[i].strbind + " " + binds[i].action));
 
 	for (int t = 0; t < numHedgehogs; t++)
 	{