From c77ad75e83f4c76fbda1420854496d895eaaa76f Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Mon, 27 Dec 2010 16:17:12 +0000
Subject: [PATCH] Fix desklock

Revert r55711!

discomfitor: SPANK! SPANK! SPANK!



SVN revision: 55762
---
 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 778e604b5..ef5219928 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)
      {