Bug 578952 - Page doesn't load when electrolysis is enabled (OS X bustage fix) [r=ted a=blocking-fennec:2.0a1+]
authorMark Finkle <mfinkle@mozilla.com>
Fri, 23 Jul 2010 11:24:52 -0400
changeset 48129 0b282467a4adb0cb6bfb274c1e5889d9ef43bd85
parent 48128 d8d0b2de29c920e93455fea0e3a25113ac904e6c
child 48130 7a3ecace673274ce60ded87963bded61f39c5c27
push id14587
push usermfinkle@mozilla.com
push dateFri, 23 Jul 2010 15:24:52 +0000
treeherdermozilla-central@0b282467a4ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, blocking-fennec
bugs578952
milestone2.0b3pre
first release with
nightly mac
0b282467a4ad / 4.0b3pre / 20100723083905 / files
nightly linux32
nightly linux64
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly mac
Bug 578952 - Page doesn't load when electrolysis is enabled (OS X bustage fix) [r=ted a=blocking-fennec:2.0a1+]
toolkit/crashreporter/nsExceptionHandler.cpp
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -576,17 +576,21 @@ nsresult SetExceptionHandler(nsILocalFil
     showOSCrashReporter = prefValue;
 #endif
 
   return NS_OK;
 }
 
 bool GetEnabled()
 {
+#if defined(XP_MACOSX)
+  return gExceptionHandler != nsnull;
+#else
   return gExceptionHandler != nsnull && !gExceptionHandler->IsOutOfProcess();
+#endif
 }
 
 bool GetMinidumpPath(nsAString& aPath)
 {
   if (!gExceptionHandler)
     return false;
 
   aPath = CONVERT_XP_CHAR_TO_UTF16(gExceptionHandler->dump_path().c_str());