QTfrontend/hwform.cpp
changeset 5147 a2ae7702bb75
parent 5140 932307228d05
child 5204 e1a5f4d5d86a
--- a/QTfrontend/hwform.cpp	Fri Apr 15 21:36:59 2011 +0400
+++ b/QTfrontend/hwform.cpp	Fri Apr 15 22:38:50 2011 +0400
@@ -244,6 +244,8 @@
 
     connect(ui.pageDrawMap->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
 
+    connect(ui.pageConnecting, SIGNAL(cancelConnection()), this, SLOT(GoBack()));
+
 
     ammoSchemeModel = new AmmoSchemeModel(this, cfgdir->absolutePath() + "/schemes.ini");
     ui.pageScheme->setModel(ammoSchemeModel);
@@ -550,7 +552,7 @@
         if (id == ID_PAGE_NETGAME || id == ID_PAGE_NETGAME)
             GoBack();
 
-    if (curid == ID_PAGE_ROOMSLIST) NetDisconnect();
+    if (curid == ID_PAGE_ROOMSLIST || curid == ID_PAGE_CONNECTING) NetDisconnect();
     if (curid == ID_PAGE_NETGAME && hwnet) hwnet->partRoom();
     // need to work on this, can cause invalid state for admin quit trying to prevent bad state message on kick
     //if (curid == ID_PAGE_NETGAME && (!game || game->gameState != gsStarted)) hwnet->partRoom();