diff options
Diffstat (limited to 'toolkit/profile')
-rw-r--r-- | toolkit/profile/content/createProfileWizard.js | 14 | ||||
-rw-r--r-- | toolkit/profile/nsProfileLock.cpp | 23 |
2 files changed, 8 insertions, 29 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. diff --git a/toolkit/profile/nsProfileLock.cpp b/toolkit/profile/nsProfileLock.cpp index cc9ecb62e..d75b6082d 100644 --- a/toolkit/profile/nsProfileLock.cpp +++ b/toolkit/profile/nsProfileLock.cpp @@ -30,10 +30,6 @@ #include "prenv.h" #endif -#if defined(MOZ_WIDGET_GONK) -#include <sys/syscall.h> -#endif - // ********************************************************************** // class nsProfileLock // @@ -192,25 +188,6 @@ void nsProfileLock::FatalSignalHandler(int signo } } -#ifdef MOZ_WIDGET_GONK - switch (signo) { - case SIGQUIT: - case SIGILL: - case SIGABRT: - case SIGSEGV: - // Retrigger the signal for those that can generate a core dump - signal(signo, SIG_DFL); - if (info->si_code <= 0) { - if (syscall(__NR_tgkill, getpid(), syscall(__NR_gettid), signo) < 0) { - break; - } - } - return; - default: - break; - } -#endif - // Backstop exit call, just in case. _exit(signo); } |