From f97f4f5d6094ba0aaa7aec997970c89d0660e6b3 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 22 Dec 2010 22:54:22 +0000
Subject: [PATCH] avoid null deref

SVN revision: 55711
---
 src/bin/e_desklock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index ef5219928..778e604b5 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -385,7 +385,7 @@ e_desklock_hide(void)
    E_Desklock_Popup_Data *edp;
    E_Event_Desklock *ev;
 
-   if ((!edd) && (!_e_custom_desklock_exe)) return;
+   if ((!edd) || (!_e_custom_desklock_exe)) return;
 
    if (e_config->desklock_use_custom_desklock)
      {