discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=b640872edfeb713bb0d61b945b70f4b1ba6629f1

commit b640872edfeb713bb0d61b945b70f4b1ba6629f1
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Oct 27 10:34:14 2016 -0400

    Revert "only find the session recovery remember if ec->remember is not it"
    
    This reverts commit 8e6188933651408f1822b1c5c9ef2cce8e19709f.
---
 src/bin/e_remember.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c
index 6f5b60a..2190354 100644
--- a/src/bin/e_remember.c
+++ b/src/bin/e_remember.c
@@ -867,17 +867,11 @@ _e_remember_find(E_Client *ec, int check_usable)
         if ((check_usable) && (!e_remember_usable_get(rem)))
           continue;
 
-        if (ec->uuid)
+        if (!eina_streq(rem->uuid, ec->uuid)) continue;
+        if (rem->uuid)
           {
-             if ((!ec->remember) || (!(ec->remember->apply & 
E_REMEMBER_APPLY_UUID)))
-               {
-                  if (!eina_streq(rem->uuid, ec->uuid)) continue;
-                  if (rem->uuid)
-                    {
-                       if (rem->pid != ec->netwm.pid) continue;
-                       return rem;
-                    }
-               }
+             if (rem->pid != ec->netwm.pid) continue;
+             return rem;
           }
 
         if (ec->netwm.name) title = ec->netwm.name;

-- 


Reply via email to