mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Fix for bug 118240: Last screen of wizard must be changed for Mac
customization (r=smeredith)
This commit is contained in:
parent
dbc9ade56d
commit
d2de257ec2
@ -870,6 +870,9 @@ BOOL CWizardMachineApp::GoToNextNode()
|
||||
|
||||
tmpParentNode = tempNode->parent;
|
||||
|
||||
CString strPlatform = GetGlobal("lPlatform");
|
||||
CString strPageName;
|
||||
|
||||
while (tmpParentNode->localVars->pageName != "Globals")
|
||||
{
|
||||
|
||||
@ -879,6 +882,11 @@ BOOL CWizardMachineApp::GoToNextNode()
|
||||
{
|
||||
tmpParentNode->currNodeIndex++;
|
||||
|
||||
strPageName = tmpParentNode->subPages->pages.GetAt(tmpParentNode->currNodeIndex);
|
||||
// skip Mac installer screen
|
||||
if ((strPlatform != "MacintoshOSX") && (strPageName == "MacInstaller"))
|
||||
tmpParentNode->currNodeIndex++;
|
||||
|
||||
NODE* siblingNode = tmpParentNode->childNodes[tmpParentNode->currNodeIndex];
|
||||
|
||||
if (siblingNode)
|
||||
@ -1234,6 +1242,14 @@ BOOL CWizardMachineApp::IsLastNode(NODE* treeNode)
|
||||
{
|
||||
lastNode = FALSE;
|
||||
}
|
||||
|
||||
// Close Wizard after creating customized Mac files
|
||||
// and do not proceed to the windows installer screen
|
||||
CString strPlatform = GetGlobal("lPlatform");
|
||||
if ((strPlatform == "MacintoshOSX") &&
|
||||
((treeNode->localVars->pageName) == "MacInstaller"))
|
||||
lastNode = TRUE;
|
||||
|
||||
return lastNode;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user