games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Fix app freeze on attempt to exit game during loading

Browse Source
This commit is contained in:
Ivan Savenko
2024-04-29 17:02:02 +03:00
parent 86bf4f98af
commit 75ff1f7b60
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
client/CMT.cpp
View File

@@ -55,7 +55,6 @@
namespace po = boost::program_options; namespace po = boost::program_options;
namespace po_style = boost::program_options::command_line_style; namespace po_style = boost::program_options::command_line_style;
static std::atomic<bool> quitRequestedDuringOpeningPlayback = false;
static std::atomic<bool> headlessQuit = false; static std::atomic<bool> headlessQuit = false;
#ifndef VCMI_IOS #ifndef VCMI_IOS
@@ -323,9 +322,6 @@ int main(int argc, char * argv[])
#endif // ANDROID #endif // ANDROID
#endif // THREADED #endif // THREADED
if (quitRequestedDuringOpeningPlayback)
quitApplication();
if(!settings["session"]["headless"].Bool()) if(!settings["session"]["headless"].Bool())
{ {
pomtime.getDiff(); pomtime.getDiff();
@@ -416,6 +412,20 @@ static void mainLoop()
} }
} }
[[noreturn]] static void quitApplicationImmediately()
{
// Perform quick exit without executing static destructors and let OS cleanup anything that we did not
// We generally don't care about them and this leads to numerous issues, e.g.
// destruction of locked mutexes (fails an assertion), even in third-party libraries (as well as native libs on Android)
// Android - std::quick_exit is available only starting from API level 21
// Mingw, macOS and iOS - std::quick_exit is unavailable (at least in current version of CI)
#if (defined(__ANDROID_API__) && __ANDROID_API__ < 21) || (defined(__MINGW32__)) || defined(VCMI_APPLE)
::exit(0);
#else
std::quick_exit(0);
#endif
}
[[noreturn]] static void quitApplication() [[noreturn]] static void quitApplication()
{ {
if(!settings["session"]["headless"].Bool()) if(!settings["session"]["headless"].Bool())
@@ -466,24 +476,11 @@ static void mainLoop()
} }
std::cout << "Ending...\n"; std::cout << "Ending...\n";
quitApplicationImmediately();
// Perform quick exit without executing static destructors and let OS cleanup anything that we did not
// We generally don't care about them and this leads to numerous issues, e.g.
// destruction of locked mutexes (fails an assertion), even in third-party libraries (as well as native libs on Android)
// Android - std::quick_exit is available only starting from API level 21
// Mingw, macOS and iOS - std::quick_exit is unavailable (at least in current version of CI)
#if (defined(__ANDROID_API__) && __ANDROID_API__ < 21) || (defined(__MINGW32__)) || defined(VCMI_APPLE)
::exit(0);
#else
std::quick_exit(0);
#endif
} }
void handleQuit(bool ask) void handleQuit(bool ask)
{ {
// FIXME: avoids crash if player attempts to close game while opening is still playing
// use cursor handler as indicator that loading is not done yet
// proper solution would be to abort init thread (or wait for it to finish)
if(!ask) if(!ask)
{ {
if(settings["session"]["headless"].Bool()) if(settings["session"]["headless"].Bool())
@@ -498,10 +495,12 @@ void handleQuit(bool ask)
return; return;
} }
// FIXME: avoids crash if player attempts to close game while opening is still playing
// use cursor handler as indicator that loading is not done yet
// proper solution would be to abort init thread (or wait for it to finish)
if (!CCS->curh) if (!CCS->curh)
{ {
quitRequestedDuringOpeningPlayback = true; quitApplicationImmediately();
return;
} }
if (LOCPLINT) if (LOCPLINT)