Bug 977786 - nsProfileLock shouldn't set mHaveLock when locking fails. r=gcp

MozReview-Commit-ID: BYB6IjNuD0k

--HG--
extra : rebase_source : 6d6d6dc6a368a87b69c29f5338a07f69010d5c3b

Author: lultimouomo

toolkit/profile/nsProfileLock.cpp

@@ -264,8 +264,6 @@ nsresult nsProfileLock::LockWithFcntl(nsIFile *aLockFile)
             else
                 rv = NS_ERROR_FAILURE;
         }
-        else
-            mHaveLock = true;
     }
     else
     {
@@ -385,7 +383,6 @@ nsresult nsProfileLock::LockWithSymlink(nsIFile *aLockFile, bool aHaveFcntlLock)
         // We exclusively created the symlink: record its name for eventual
         // unlock-via-unlink.
         rv = NS_OK;
-        mHaveLock = true;
         mPidLockFileName = strdup(fileName);
         if (mPidLockFileName)
         {
@@ -615,7 +612,8 @@ nsresult nsProfileLock::Lock(nsIFile* aProfileDir,
     }
 #endif
 
-    mHaveLock = true;
+    if (NS_SUCCEEDED(rv))
+        mHaveLock = true;
 
     return rv;
 }