equal
deleted
inserted
replaced
972 setFocusPolicy(Qt::StrongFocus); |
972 setFocusPolicy(Qt::StrongFocus); |
973 quint8 id = ui.Pages->currentIndex(); |
973 quint8 id = ui.Pages->currentIndex(); |
974 if (id == ID_PAGE_INGAME || |
974 if (id == ID_PAGE_INGAME || |
975 // was room chief and the game was aborted |
975 // was room chief and the game was aborted |
976 (hwnet && hwnet->isRoomChief() && hwnet->isInRoom() && |
976 (hwnet && hwnet->isRoomChief() && hwnet->isInRoom() && |
977 (gameState == gsInterrupted || gameState == gsStopped || gameState == gsDestroyed))) { |
977 (gameState == gsInterrupted || gameState == gsStopped || gameState == gsDestroyed || gameState == gsHalted))) { |
978 if (id == ID_PAGE_INGAME) GoBack(); |
978 if (id == ID_PAGE_INGAME) GoBack(); |
979 Music(ui.pageOptions->CBEnableFrontendMusic->isChecked()); |
979 Music(ui.pageOptions->CBEnableFrontendMusic->isChecked()); |
980 if (wBackground) wBackground->startAnimation(); |
980 if (wBackground) wBackground->startAnimation(); |
981 if (hwnet) hwnet->gameFinished(); |
981 if (hwnet) hwnet->gameFinished(); |
982 } |
982 } |
|
983 if (gameState == gsHalted) close(); |
983 }; |
984 }; |
984 } |
985 } |
985 } |
986 } |
986 |
987 |
987 void HWForm::CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo) |
988 void HWForm::CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo) |