From 0f9ce7ec3becc6cd4ae80038ef963ebfd14d2805 Mon Sep 17 00:00:00 2001
From: dborth <dborth@d154fe42-be53-0410-aac0-356034171556>
Date: Thu, 9 Jul 2009 17:48:04 +0000
Subject: [PATCH] prevent lockups on exit

---
 source/ngc/menu.cpp | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/source/ngc/menu.cpp b/source/ngc/menu.cpp
index 98dc606..a11f6fc 100644
--- a/source/ngc/menu.cpp
+++ b/source/ngc/menu.cpp
@@ -317,6 +317,8 @@ UpdateGUI (void *arg)
  * progress bar showing % completion, or a throbber that only shows that an
  * action is in progress.
  ***************************************************************************/
+static int progsleep = 0;
+
 static void
 ProgressWindow(char *title, char *msg)
 {
@@ -379,7 +381,17 @@ ProgressWindow(char *title, char *msg)
 		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)
 		return;
 
@@ -395,7 +407,15 @@ ProgressWindow(char *title, char *msg)
 
 	while(showProgress)
 	{
-		usleep(20000);
+		progsleep = 20000;
+
+		while(progsleep > 0)
+		{
+			if(!showProgress)
+				break;
+			usleep(THREAD_SLEEP);
+			progsleep -= THREAD_SLEEP;
+		}
 
 		if(showProgress == 1)
 		{
@@ -471,7 +491,7 @@ CancelAction()
 void
 ShowProgress (const char *msg, int done, int total)
 {
-	if(!mainWindow)
+	if(!mainWindow || ExitRequested || ShutdownRequested)
 		return;
 
 	if(total < (256*1024))
@@ -502,7 +522,7 @@ ShowProgress (const char *msg, int done, int total)
 void
 ShowAction (const char *msg)
 {
-	if(!mainWindow)
+	if(!mainWindow || ExitRequested || ShutdownRequested)
 		return;
 
 	if(showProgress != 0)