commit c4f55f9f2c29caad1270ece1bc723d22d0996f3e Author: Kathy Brade brade@pearlcrescent.com Date: Mon Nov 27 16:21:56 2017 -0500

Bug 24428: bootstrap error message sometimes lost

Avoid replacing an error message with a generic bootstrap progress message. --- src/chrome/content/network-settings.js | 7 +++++++ 1 file changed, 7 insertions(+)

diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index da48bab..773a647 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -596,6 +596,13 @@ function updateBootstrapProgress(aStatusObj) if (!isShowingProgress()) return;

+ // Ignore status updates if the Reconfigure button is showing because this + // means that we are currently displaying an error message, and we do not + // want the error to be replaced by a generic progress message. + let progressContent = document.getElementById("progressContent"); + if (progressContent && progressContent.hasAttribute("isShowingReconfigure")) + return; + let labelText = TorLauncherUtil.getLocalizedBootstrapStatus(aStatusObj, "TAG"); let percentComplete = (aStatusObj.PROGRESS) ? aStatusObj.PROGRESS : 0;