Bug 578952 - Page doesn't load when electrolysis is enabled [r=ted a=blocking-fennec:2.0a1+]
authorChris Jones <jones.chris.g@gmail.com>
Fri, 23 Jul 2010 01:28:55 -0500
changeset 48126 bcae411bc333534774a1be0cc1be46220f04c718
parent 48125 b993e9c8edbe8bbb5a567c06c9ca1768673ba778
child 48128 d8d0b2de29c920e93455fea0e3a25113ac904e6c
push id14585
push usermfinkle@mozilla.com
push dateFri, 23 Jul 2010 13:33:45 +0000
treeherdermozilla-central@bcae411bc333 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, blocking-fennec
bugs578952
milestone2.0b3pre
first release with
nightly win64
bcae411bc333 / 4.0b3pre / 20100723063738 / files
nightly linux32
nightly linux64
nightly mac
nightly win32
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly win64
Bug 578952 - Page doesn't load when electrolysis is enabled [r=ted a=blocking-fennec:2.0a1+]
toolkit/crashreporter/nsExceptionHandler.cpp
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -576,17 +576,17 @@ nsresult SetExceptionHandler(nsILocalFil
     showOSCrashReporter = prefValue;
 #endif
 
   return NS_OK;
 }
 
 bool GetEnabled()
 {
-  return gExceptionHandler != nsnull;
+  return gExceptionHandler != nsnull && !gExceptionHandler->IsOutOfProcess();
 }
 
 bool GetMinidumpPath(nsAString& aPath)
 {
   if (!gExceptionHandler)
     return false;
 
   aPath = CONVERT_XP_CHAR_TO_UTF16(gExceptionHandler->dump_path().c_str());