241 connect(ui.pageNetType->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack())); |
241 connect(ui.pageNetType->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack())); |
242 connect(ui.pageNetType->BtnLAN, SIGNAL(clicked()), this, SLOT(GoToNet())); |
242 connect(ui.pageNetType->BtnLAN, SIGNAL(clicked()), this, SLOT(GoToNet())); |
243 connect(ui.pageNetType->BtnOfficialServer, SIGNAL(clicked()), this, SLOT(NetConnectOfficialServer())); |
243 connect(ui.pageNetType->BtnOfficialServer, SIGNAL(clicked()), this, SLOT(NetConnectOfficialServer())); |
244 |
244 |
245 connect(ui.pageDrawMap->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack())); |
245 connect(ui.pageDrawMap->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack())); |
|
246 |
|
247 connect(ui.pageConnecting, SIGNAL(cancelConnection()), this, SLOT(GoBack())); |
246 |
248 |
247 |
249 |
248 ammoSchemeModel = new AmmoSchemeModel(this, cfgdir->absolutePath() + "/schemes.ini"); |
250 ammoSchemeModel = new AmmoSchemeModel(this, cfgdir->absolutePath() + "/schemes.ini"); |
249 ui.pageScheme->setModel(ammoSchemeModel); |
251 ui.pageScheme->setModel(ammoSchemeModel); |
250 ui.pageMultiplayer->gameCFG->GameSchemes->setModel(ammoSchemeModel); |
252 ui.pageMultiplayer->gameCFG->GameSchemes->setModel(ammoSchemeModel); |
548 |
550 |
549 if ((!hwnet) || (!hwnet->isInRoom())) |
551 if ((!hwnet) || (!hwnet->isInRoom())) |
550 if (id == ID_PAGE_NETGAME || id == ID_PAGE_NETGAME) |
552 if (id == ID_PAGE_NETGAME || id == ID_PAGE_NETGAME) |
551 GoBack(); |
553 GoBack(); |
552 |
554 |
553 if (curid == ID_PAGE_ROOMSLIST) NetDisconnect(); |
555 if (curid == ID_PAGE_ROOMSLIST || curid == ID_PAGE_CONNECTING) NetDisconnect(); |
554 if (curid == ID_PAGE_NETGAME && hwnet) hwnet->partRoom(); |
556 if (curid == ID_PAGE_NETGAME && hwnet) hwnet->partRoom(); |
555 // need to work on this, can cause invalid state for admin quit trying to prevent bad state message on kick |
557 // need to work on this, can cause invalid state for admin quit trying to prevent bad state message on kick |
556 //if (curid == ID_PAGE_NETGAME && (!game || game->gameState != gsStarted)) hwnet->partRoom(); |
558 //if (curid == ID_PAGE_NETGAME && (!game || game->gameState != gsStarted)) hwnet->partRoom(); |
557 |
559 |
558 if (curid == ID_PAGE_SCHEME) |
560 if (curid == ID_PAGE_SCHEME) |