From 84697e5dbd1917d3c239111cb35f7b51abafceca Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Fri, 3 Feb 2017 18:29:09 +0100 Subject: [PATCH] Backed out changeset 96ecba4a2327 (bug 1329752) for Windows build bustage due to attempted string conversion ins nsAppRunner.cpp. r=backout on a CLOSED TREE --- toolkit/xre/nsAppRunner.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index dfecf6490c35..ecdd89383467 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -4935,12 +4935,10 @@ MultiprocessBlockPolicy() { * Avoids enabling e10s for Windows XP users on the release channel. */ #if defined(XP_WIN) - if (!IsVistaOrLater()) { - nsAdoptingString channelName = Preferences::GetDefaultCString("app.update.channel"); - if (channelName.EqualsLiteral("release") || channelName.EqualsLiteral("esr")) { - gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem; - return gMultiprocessBlockPolicy; - } + if (Preferences::GetDefaultCString("app.update.channel").EqualsLiteral("release") && + !IsVistaOrLater()) { + gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem; + return gMultiprocessBlockPolicy; } #endif // XP_WIN