prevent lockups on exit

This commit is contained in:
dborth 2009-07-09 17:48:04 +00:00
parent 7a0bfd2e44
commit 0f9ce7ec3b

View File

@ -317,6 +317,8 @@ UpdateGUI (void *arg)
* progress bar showing % completion, or a throbber that only shows that an * progress bar showing % completion, or a throbber that only shows that an
* action is in progress. * action is in progress.
***************************************************************************/ ***************************************************************************/
static int progsleep = 0;
static void static void
ProgressWindow(char *title, char *msg) ProgressWindow(char *title, char *msg)
{ {
@ -379,7 +381,17 @@ ProgressWindow(char *title, char *msg)
promptWindow.Append(&throbberImg); promptWindow.Append(&throbberImg);
} }
usleep(400000); // wait to see if progress flag changes soon // wait to see if progress flag changes soon
progsleep = 400000;
while(progsleep > 0)
{
if(!showProgress)
break;
usleep(THREAD_SLEEP);
progsleep -= THREAD_SLEEP;
}
if(!showProgress) if(!showProgress)
return; return;
@ -395,7 +407,15 @@ ProgressWindow(char *title, char *msg)
while(showProgress) while(showProgress)
{ {
usleep(20000); progsleep = 20000;
while(progsleep > 0)
{
if(!showProgress)
break;
usleep(THREAD_SLEEP);
progsleep -= THREAD_SLEEP;
}
if(showProgress == 1) if(showProgress == 1)
{ {
@ -471,7 +491,7 @@ CancelAction()
void void
ShowProgress (const char *msg, int done, int total) ShowProgress (const char *msg, int done, int total)
{ {
if(!mainWindow) if(!mainWindow || ExitRequested || ShutdownRequested)
return; return;
if(total < (256*1024)) if(total < (256*1024))
@ -502,7 +522,7 @@ ShowProgress (const char *msg, int done, int total)
void void
ShowAction (const char *msg) ShowAction (const char *msg)
{ {
if(!mainWindow) if(!mainWindow || ExitRequested || ShutdownRequested)
return; return;
if(showProgress != 0) if(showProgress != 0)