diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /toolkit/profile/content/createProfileWizard.js | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.gz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.lz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.xz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'toolkit/profile/content/createProfileWizard.js')
| -rw-r--r-- | toolkit/profile/content/createProfileWizard.js | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/toolkit/profile/content/createProfileWizard.js b/toolkit/profile/content/createProfileWizard.js index 1963f66bc..14d006b31 100644 --- a/toolkit/profile/content/createProfileWizard.js +++ b/toolkit/profile/content/createProfileWizard.js @@ -96,13 +96,15 @@ function chooseProfileFolder() dirChooser.show(); newProfileRoot = dirChooser.file; - // Disable the "Default Folder..." button when the default profile folder - // was selected manually in the File Picker. - document.getElementById("useDefault").disabled = - (newProfileRoot.parent.equals(gDefaultProfileParent)); + if (newProfileRoot) { + // Disable the "Default Folder..." button when the default profile folder + // was selected manually in the File Picker. + document.getElementById("useDefault").disabled = + (newProfileRoot.parent.equals(gDefaultProfileParent)); - gProfileRoot = newProfileRoot; - updateProfileDisplay(); + gProfileRoot = newProfileRoot; + updateProfileDisplay(); + } } // Checks the current user input for validity and triggers an error message accordingly. |