mozilla-central: changeset 48126:bcae411bc333534774a1be0cc1be46220f04c718

author	Chris Jones <jones.chris.g@gmail.com>
	Fri, 23 Jul 2010 01:28:55 -0500
changeset 48126	bcae411bc333534774a1be0cc1be46220f04c718
parent 48125	b993e9c8edbe8bbb5a567c06c9ca1768673ba778
child 48128	d8d0b2de29c920e93455fea0e3a25113ac904e6c
push id	14585
push user	mfinkle@mozilla.com
push date	Fri, 23 Jul 2010 13:33:45 +0000
treeherder	mozilla-central@bcae411bc333 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ted, blocking-fennec
bugs	578952
milestone	2.0b3pre
first release with	nightly win64 bcae411bc333 / 4.0b3pre / 20100723063738 / files nightly linux32 30239e4cebd8 / 4.0b3pre / 20100724030057 / files nightly linux64 30239e4cebd8 / 4.0b3pre / 20100724030705 / files nightly mac 0b282467a4ad / 4.0b3pre / 20100723083905 / files nightly win32 30239e4cebd8 / 4.0b3pre / 20100724040639 / files
last release without	nightly linux32 58101a16aff7 / 4.0b3pre / 20100723031340 / files nightly linux64 58101a16aff7 / 4.0b3pre / 20100723030902 / files nightly mac 58101a16aff7 / 4.0b3pre / 20100723031249 / files nightly win32 58101a16aff7 / 4.0b3pre / 20100723040900 / files nightly win64 9805493631d4 / 4.0b3pre / 20100722045421 / files
releases	nightly win64 4.0b3pre / 20100723063738 / pushlog to previous

--- 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());