зеркало из https://github.com/mozilla/pjs.git
Prevent multiple downloads for mixed keyboard and mouse input. [nsbeta2+ b = 31042; r=dbragg]
This commit is contained in:
Родитель
249681b745
Коммит
8b225e73ad
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -303,6 +303,7 @@ InTerminalContent(EventRecord* evt, WindowPtr wCurrPtr)
|
|||
DisableNavButtons();
|
||||
ClearSiteSelector();
|
||||
SpawnSDThread(Install, &tid);
|
||||
gInstallStarted = true;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче