From: Holger Schemel Date: Sat, 30 Oct 2021 18:17:18 +0000 (+0200) Subject: added waiting for active API threads on program exit X-Git-Tag: 4.3.0.0~5 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=381c9767a6a124feb2139051bace01eed817b03d;p=rocksndiamonds.git added waiting for active API threads on program exit --- diff --git a/src/init.c b/src/init.c index 8c0f26e3..8c6c7e12 100644 --- a/src/init.c +++ b/src/init.c @@ -6351,8 +6351,44 @@ void OpenAll(void) #endif } +static boolean WaitForApiThreads(void) +{ + unsigned int thread_delay = 0; + unsigned int thread_delay_value = 10000; + + if (program.api_thread_count == 0) + return TRUE; + + // deactivate global animations (not accessible in game state "loading") + setup.toons = FALSE; + + // set game state to "loading" to be able to show busy animation + SetGameStatus(GAME_MODE_LOADING); + + ResetDelayCounter(&thread_delay); + + // wait for threads to finish (and fail on timeout) + while (program.api_thread_count > 0) + { + if (DelayReached(&thread_delay, thread_delay_value)) + { + Error("failed waiting for threads - TIMEOUT"); + + return FALSE; + } + + UPDATE_BUSY_STATE(); + + Delay(20); + } + + return TRUE; +} + void CloseAllAndExit(int exit_value) { + WaitForApiThreads(); + StopSounds(); FreeAllSounds(); FreeAllMusic();