Bug 1172393 - Let XPCOM shutdown properly on Windows versions later than XP - r=mccr8

This commit is contained in:
Edwin Flores 2015-06-10 14:39:05 +12:00
parent a5ade4b835
commit 6e95c9765a

View File

@ -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);
}