games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Code Issues Releases Activity

Fix another case of assertion failure on exit

Browse Source
This commit is contained in:
Ivan Savenko
2022-12-16 16:53:21 +02:00
parent 39367473d2
commit 8665f36778
1 changed files with 84 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
client/CMT.cpp
View File

@ -1508,10 +1508,8 @@ static void mainLoop()
} }
} }
void handleQuit(bool ask) static void quitApplication()
{ {
auto quitApplication = []()
{
if(!settings["session"]["headless"].Bool()) if(!settings["session"]["headless"].Bool())
{ {
if(CSH->client) if(CSH->client)
@ -1574,22 +1572,25 @@ void handleQuit(bool ask)
logConfig = nullptr; logConfig = nullptr;
} }
std::cout << "Ending...\n"; std::cout << "Ending...\n";
exit(0);
}
void handleQuit(bool ask)
{
if(CSH->client && LOCPLINT && ask)
{
CCS->curh->changeGraphic(ECursor::ADVENTURE, 0);
LOCPLINT->showYesNoDialog(CGI->generaltexth->allTexts[69], [](){
// Workaround for assertion failure on exit: // Workaround for assertion failure on exit:
// handleQuit() is alway called during SDL event processing // handleQuit() is alway called during SDL event processing
// during which, eventsM is kept locked // during which, eventsM is kept locked
// this leads to assertion failure if boost::mutex is in locked state // this leads to assertion failure if boost::mutex is in locked state
eventsM.unlock(); eventsM.unlock();
exit(0); quitApplication();
}; }, nullptr);
if(CSH->client && LOCPLINT && ask)
{
CCS->curh->changeGraphic(ECursor::ADVENTURE, 0);
LOCPLINT->showYesNoDialog(CGI->generaltexth->allTexts[69], quitApplication, nullptr);
} }
else else
{ {