mozilla-central: changeset 56861:488177edfe601687eeb371c143601adad1463843

author	Ehsan Akhgari <ehsan@mozilla.com>
	Sat, 02 Oct 2010 12:12:08 -0400
changeset 56861	488177edfe601687eeb371c143601adad1463843
parent 56860	c0dbdafa583c9b0175263a2d2b07193e0aa255e0
child 56862	b40c5634a2ea01a2120d96fb759a67f063861f4a
push id	16717
push user	eakhgari@mozilla.com
push date	Thu, 04 Nov 2010 20:46:44 +0000
treeherder	mozilla-central@e2bab1fa602e [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	dolske, gavin, bsmedberg
bugs	601253
milestone	2.0b8pre
first release with	nightly linux32 5947e95a21d1 / 4.0b8pre / 20101105025919 / files nightly linux64 5947e95a21d1 / 4.0b8pre / 20101105030809 / files nightly mac 5947e95a21d1 / 4.0b8pre / 20101105030743 / files nightly win32 5947e95a21d1 / 4.0b8pre / 20101105041932 / files nightly win64 a1705bc179e4 / 4.0b8pre / 20101105054821 / files
last release without	nightly linux32 f7016571b472 / 4.0b8pre / 20101104025921 / files nightly linux64 f7016571b472 / 4.0b8pre / 20101104030828 / files nightly mac f7016571b472 / 4.0b8pre / 20101104030743 / files nightly win32 f7016571b472 / 4.0b8pre / 20101104041903 / files nightly win64 f7016571b472 / 4.0b8pre / 20101104054656 / files

--- a/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js
+++ b/browser/components/privatebrowsing/src/nsPrivateBrowsingService.js
@@ -464,18 +464,20 @@ PrivateBrowsingService.prototype = {
   },
 
   // nsICommandLineHandler
 
   handle: function PBS_handle(aCmdLine) {
     if (aCmdLine.handleFlag("private", false))
       ; // It has already been handled
     else if (aCmdLine.handleFlag("private-toggle", false)) {
+      if (this._autoStarted) {
+        throw Cr.NS_ERROR_ABORT;
+      }
       this.privateBrowsingEnabled = !this.privateBrowsingEnabled;
-      this._autoStarted = false;
       this._lastChangedByCommandLine = true;
     }
   },
 
   get helpInfo() {
     return "  -private           Enable private browsing mode.\n" +
            "  -private-toggle    Toggle private browsing mode.\n";
   },