From 8e6188933651408f1822b1c5c9ef2cce8e19709f Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Thu, 20 Oct 2016 12:13:22 -0400
Subject: [PATCH] only find the session recovery remember if ec->remember is
 not it

ref T4512
---
 src/bin/e_remember.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c
index 21903544b..6f5b60a44 100644
--- a/src/bin/e_remember.c
+++ b/src/bin/e_remember.c
@@ -867,11 +867,17 @@ _e_remember_find(E_Client *ec, int check_usable)
         if ((check_usable) && (!e_remember_usable_get(rem)))
           continue;
 
-        if (!eina_streq(rem->uuid, ec->uuid)) continue;
-        if (rem->uuid)
+        if (ec->uuid)
           {
-             if (rem->pid != ec->netwm.pid) continue;
-             return rem;
+             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 (ec->netwm.name) title = ec->netwm.name;