games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-11 11:31:52 +02:00
Code Issues Releases Activity

Unblock UI while tutorial loading

Browse Source
This commit is contained in:
nordsoft 2023-08-10 01:27:13 +04:00
parent f4869cbfb0
commit ef7008a753
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/mainmenu/CMainMenu.cpp
View File

@ -386,18 +386,29 @@ void CMainMenu::startTutorial()
CMainMenu::openLobby(ESelectionScreen::newGame, true, nullptr, ELoadMode::NONE); CMainMenu::openLobby(ESelectionScreen::newGame, true, nullptr, ELoadMode::NONE);
GH.dispatchMainThread([mapInfo](){ std::thread waitForConnectionThread([mapInfo](){
while(!CSH->c || !CSH->c->handler) boost::this_thread::sleep(boost::posix_time::milliseconds(100)); //delay this thread
boost::this_thread::sleep(boost::posix_time::milliseconds(50));
while(!CSH->mi || mapInfo->fileURI != CSH->mi->fileURI) //connecting to server
while(CSH->state != EClientState::LOBBY)
{ {
CSH->setMapInfo(mapInfo); if(CSH->state == EClientState::CONNECTION_CANCELLED || CSH->state == EClientState::NONE)
return;
boost::this_thread::sleep(boost::posix_time::milliseconds(50)); boost::this_thread::sleep(boost::posix_time::milliseconds(50));
} }
CSH->sendStartGame(); //start game from main thread
GH.dispatchMainThread([mapInfo]()
{
while(!CSH->si || mapInfo->fileURI != CSH->si->mapname)
{
CSH->setMapInfo(mapInfo);
boost::this_thread::sleep(boost::posix_time::milliseconds(50));
}
CSH->sendStartGame();
});
}); });
waitForConnectionThread.detach();
} }
std::shared_ptr<CMainMenu> CMainMenu::create() std::shared_ptr<CMainMenu> CMainMenu::create()