From 4e8c4761530cc686c09c25ae3fda2dc4a024aa6c Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 8 Oct 2014 09:39:44 -0400
Subject: [PATCH] screenShield: fix trace back when unlocking session from
 another vt

commit 1d374ac8bd496f6fa6f4c55ffd207bd30bd50075 introduced a bug that
prevents unlock from working when initiated from another VT
(user switching).

This commit fixes the exception raised.

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

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 1c1dca6cf..32ef1ca9e 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -920,8 +920,10 @@ const ScreenShield = new Lang.Class({
         this._lockScreenState = MessageTray.State.HIDDEN;
         this._lockScreenGroup.hide();
 
-        this._dialog.actor.grab_key_focus();
-        this._dialog.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        if (this._dialog) {
+            this._dialog.actor.grab_key_focus();
+            this._dialog.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        }
     },
 
     _hideLockScreen: function(animate, velocity) {