--- a/QTfrontend/hwform.cpp	Thu Oct 23 15:12:38 2008 +0000
+++ b/QTfrontend/hwform.cpp	Fri Oct 24 12:57:06 2008 +0000
@@ -102,7 +102,6 @@
 	connect(ui.pageNetServer->BtnStart,	SIGNAL(clicked()),	this, SLOT(NetStartServer()));
 
 	connect(ui.pageNetGame->BtnBack,	SIGNAL(clicked()),	this, SLOT(GoBack()));
-	connect(ui.pageNetGame->BtnGo, SIGNAL(clicked()), this, SLOT(NetStartGame()));
 	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(setEnabledGameStart(bool)),
 		ui.pageNetGame->BtnGo, SLOT(setEnabled(bool)));
 	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(SetupClicked()), this, SLOT(IntermediateSetup()));
@@ -451,6 +450,7 @@
 		ui.pageNetGame->pChatWidget, SLOT(nickAdded(const QString&)));
 	connect(hwnet, SIGNAL(nickRemoved(const QString&)),
 		ui.pageNetGame->pChatWidget, SLOT(nickRemoved(const QString&)));
+	connect(ui.pageNetGame->BtnGo, SIGNAL(clicked()), hwnet, SLOT(ToggleReady()));
 
 	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(hhogsNumChanged(const HWTeam&)),
 		hwnet, SLOT(onHedgehogsNumChanged(const HWTeam&)));
@@ -560,13 +560,6 @@
 	GoToPage(ID_PAGE_NETGAME);
 }
 
-void HWForm::NetStartGame()
-{
-	ui.pageNetGame->BtnGo->setText(QPushButton::tr("Waiting"));
-	ui.pageNetGame->BtnGo->setEnabled(false);
-	hwnet->Ready();
-}
-
 void HWForm::AddNetTeam(const HWTeam& team)
 {
   ui.pageNetGame->pNetTeamsWidget->addTeam(team);
@@ -611,12 +604,6 @@
 			}
 		};
 	}
-
-	if (hwnet)
-	{
-		ui.pageNetGame->BtnGo->setText(QPushButton::tr("Go!"));
-		ui.pageNetGame->BtnGo->setEnabled(true);
-	}
 }
 
 void HWForm::AddStatText(const QString & msg)