mozilla-central: changeset 48129:0b282467a4adb0cb6bfb274c1e5889d9ef43bd85

author	Mark Finkle <mfinkle@mozilla.com>
	Fri, 23 Jul 2010 11:24:52 -0400
changeset 48129	0b282467a4adb0cb6bfb274c1e5889d9ef43bd85
parent 48128	d8d0b2de29c920e93455fea0e3a25113ac904e6c
child 48130	7a3ecace673274ce60ded87963bded61f39c5c27
push id	14587
push user	mfinkle@mozilla.com
push date	Fri, 23 Jul 2010 15:24:52 +0000
treeherder	mozilla-central@0b282467a4ad [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 mac 0b282467a4ad / 4.0b3pre / 20100723083905 / files nightly linux32 30239e4cebd8 / 4.0b3pre / 20100724030057 / files nightly linux64 30239e4cebd8 / 4.0b3pre / 20100724030705 / files nightly win32 30239e4cebd8 / 4.0b3pre / 20100724040639 / files nightly win64 6995adf228ed / 4.0b3pre / 20100723164001 / 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 bcae411bc333 / 4.0b3pre / 20100723063738 / files
releases	nightly mac 4.0b3pre / 20100723083905 / pushlog to previous

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