From 73362beb0b8006c424c56b3903956c8e1b029aea Mon Sep 17 00:00:00 2001
From: Adel Gadllah <adel.gadllah@gmail.com>
Date: Fri, 26 Jul 2013 00:21:30 +0200
Subject: [PATCH] screenShield: Don't lock after crash if locking is disabled

When the user has disabled locking we shouldn't lock the screen.

https://bugzilla.gnome.org/show_bug.cgi?id=704884
---
 js/ui/screenShield.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 03e457c90..6aef53b1a 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -1335,6 +1335,8 @@ const ScreenShield = new Lang.Class({
 
     // If the previous shell crashed, and gnome-session restarted us, then re-lock
     lockIfWasLocked: function() {
+        if (!this._settings.get_boolean(LOCK_ENABLED_KEY))
+            return;
         let wasLocked = global.get_runtime_state('b', LOCKED_STATE_STR);
         if (wasLocked === null)
             return;