From 98bc594299c0b2a3e56b143acaf2dfa4a6218518 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 27 Oct 2016 10:34:05 -0400 Subject: [PATCH] Revert "correctly handle applying of non-SR remember in remember config" This reverts commit 62068912e95600ab5db60cc616acc4c5fb89b8cd. --- src/bin/e_int_client_remember.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/bin/e_int_client_remember.c b/src/bin/e_int_client_remember.c index f87a74a49..5a63a30e1 100644 --- a/src/bin/e_int_client_remember.c +++ b/src/bin/e_int_client_remember.c @@ -418,10 +418,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata { /* Actually take our cfdata settings and apply them in real life */ E_Client *ec = cfdata->client; - E_Remember *rem = ec->remember; - - if (rem && (rem->apply & E_REMEMBER_APPLY_UUID)) - rem = cfdata->backup_rem; + E_Remember *rem = cfdata->backup_rem ?: ec->remember; if (cfdata->mode == MODE_NOTHING) { @@ -437,10 +434,14 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata if (!rem) { rem = e_remember_new(); - if (!rem) return 0; - cfdata->applied = 0; - if (ec->remember && (ec->remember->apply & E_REMEMBER_APPLY_UUID)) - cfdata->backup_rem = rem; + if (rem) + { + if ((!ec->remember) || (!(ec->remember->apply & E_REMEMBER_APPLY_UUID))) + ec->remember = rem; + cfdata->applied = 0; + } + else + return 0; } e_remember_default_match_set(rem, cfdata->client);