From dbca0c72ec64b346f4416ed7a91df4dadaaab056 Mon Sep 17 00:00:00 2001 From: Edwin Flores Date: Wed, 10 Jun 2015 14:39:05 +1200 Subject: [PATCH] Bug 1172393 - Let XPCOM shutdown properly on Windows versions later than XP - r=mccr8 --- xpcom/build/XPCOMInit.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp index c227ecebf29c..78cc67d389f7 100644 --- a/xpcom/build/XPCOMInit.cpp +++ b/xpcom/build/XPCOMInit.cpp @@ -93,6 +93,7 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); #include "SpecialSystemDirectory.h" #if defined(XP_WIN) +#include "mozilla/WindowsVersion.h" #include "nsWindowsRegKey.h" #endif @@ -954,7 +955,7 @@ ShutdownXPCOM(nsIServiceManager* aServMgr) // On Windows XP debug, there are intermittent failures in // dom/media/tests/mochitest/test_peerConnection_basicH264Video.html // if we don't exit early in a child process. See bug 1073310. - if (XRE_GetProcessType() == GeckoProcessType_Content) { + if (XRE_GetProcessType() == GeckoProcessType_Content && !IsVistaOrLater()) { NS_WARNING("Exiting child process early!"); exit(0); }