From 6fac7551f95ff5cf3ef320643f9a097558ecf656 Mon Sep 17 00:00:00 2001
From: "sgehani%netscape.com"
 <sgehani%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 7 Jul 2000 06:45:43 +0000
Subject: [PATCH] Prevent multiple downloads for mixed keyboard and mouse
 input.  [nsbeta2+ b = 31042; r=dbragg]

git-svn-id: svn://10.0.0.236/trunk@73812 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpinstall/wizard/mac/src/EvtHandlers.c      | 8 +++-----
 mozilla/xpinstall/wizard/mac/src/MacInstallWizard.c | 1 +
 mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h | 1 +
 mozilla/xpinstall/wizard/mac/src/TerminalWin.c      | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mozilla/xpinstall/wizard/mac/src/EvtHandlers.c b/mozilla/xpinstall/wizard/mac/src/EvtHandlers.c
index 979a08dbe39..8dbbda120c4 100644
--- a/mozilla/xpinstall/wizard/mac/src/EvtHandlers.c
+++ b/mozilla/xpinstall/wizard/mac/src/EvtHandlers.c
@@ -101,8 +101,6 @@ void HandleMouseDown(EventRecord* evt)
 	}
 }
 
-static Boolean sInstallStarted = false;
-
 void HandleKeyDown(EventRecord* evt)
 {
 	char 			keyPressed;
@@ -118,7 +116,7 @@ void HandleKeyDown(EventRecord* evt)
 	{		
 		case '\r':
 		case '\3':
-			if (gControls->nextB && !sInstallStarted)
+			if (gControls->nextB && !gInstallStarted)
 			{
 				HiliteControl(gControls->nextB, 1);
 				Delay(8, &finalTicks);
@@ -159,12 +157,12 @@ void HandleKeyDown(EventRecord* evt)
 					ShowTerminalWin();
 					return;
 				case kTerminalID:
-					if (!sInstallStarted)
+					if (!gInstallStarted)
 					{		    
 					    DisableNavButtons();
 					    ClearSiteSelector();
 						SpawnSDThread(Install, &tid);
-						sInstallStarted = true;
+						gInstallStarted = true;
 					}
 					return;
 				default:
diff --git a/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.c b/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.c
index ed340cbe6ae..fbf8f3cf183 100644
--- a/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.c
+++ b/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.c
@@ -32,6 +32,7 @@ Boolean 	gSDDlg = false;
 WindowPtr 	gWPtr = NULL;
 short		gCurrWin = 0;
 InstWiz		*gControls = NULL;
+Boolean     gInstallStarted = false;
 
 EventProc 			gSDIEvtHandler;  /* SDI */
 SDI_NETINSTALL 		gInstFunc;
diff --git a/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h b/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h
index 48c0706bcfc..cd06c75de27 100644
--- a/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h
+++ b/mozilla/xpinstall/wizard/mac/src/MacInstallWizard.h
@@ -550,6 +550,7 @@ extern short 		gCurrWin;
 extern InstWiz		*gControls;
 extern Boolean 		gDone;
 extern Boolean		gSDDlg;
+extern Boolean      gInstallStarted;
 
 extern EventProc		 gSDIEvtHandler;
 extern SDI_NETINSTALL 	 gInstFunc;
diff --git a/mozilla/xpinstall/wizard/mac/src/TerminalWin.c b/mozilla/xpinstall/wizard/mac/src/TerminalWin.c
index ed4d1d8eb3b..1794ca8c5f1 100644
--- a/mozilla/xpinstall/wizard/mac/src/TerminalWin.c
+++ b/mozilla/xpinstall/wizard/mac/src/TerminalWin.c
@@ -303,6 +303,7 @@ InTerminalContent(EventRecord* evt, WindowPtr wCurrPtr)
 		    DisableNavButtons();
 		    ClearSiteSelector();
 			SpawnSDThread(Install, &tid);
+			gInstallStarted = true;
 			return;
 		}
 	}