Bug 1308820 - Make sure to close the print progress dialog if print preview is exited. r=Gijs

MozReview-Commit-ID: 391bf9J2Qcf

toolkit/components/printing/content/printUtils.js

@@ -237,10 +237,7 @@ var PrintUtils = {
 
       // If the user transits too quickly within preview and we have a pending
       // progress dialog, we will close it before opening a new one.
-      if (this._webProgressPP && this._webProgressPP.value) {
-        this._webProgressPP.value.onStateChange(null, null,
-          Components.interfaces.nsIWebProgressListener.STATE_STOP, 0);
-      }
+      this.ensureProgressDialogClosed();
     }
 
     this._webProgressPP = {};
@@ -706,6 +703,8 @@ var PrintUtils = {
 
     this.setSimplifiedMode(false);
 
+    this.ensureProgressDialogClosed();
+
     this._listener.onExit();
   },
 
@@ -746,7 +745,18 @@ var PrintUtils = {
       aEvent.preventDefault();
       aEvent.stopPropagation();
     }
-  }
+  },
+
+  /**
+   * If there's a printing or print preview progress dialog displayed, force
+   * it to close now.
+   */
+  ensureProgressDialogClosed() {
+    if (this._webProgressPP && this._webProgressPP.value) {
+      this._webProgressPP.value.onStateChange(null, null,
+        Components.interfaces.nsIWebProgressListener.STATE_STOP, 0);
+    }
+  },
 }
 
 PrintUtils.init();