From e3658484068fb2433c1b7747d65fd76088e1dc90 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 20 Oct 2016 12:14:16 -0400 Subject: [PATCH] apply non-session recovery remember to client when creating recovery remember ensure that the attributes get applied before engaging SR mode ref T4512 --- src/bin/e_comp_wl_extensions.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp_wl_extensions.c b/src/bin/e_comp_wl_extensions.c index 2ead071be..fb5b18f1e 100644 --- a/src/bin/e_comp_wl_extensions.c +++ b/src/bin/e_comp_wl_extensions.c @@ -37,10 +37,16 @@ _e_comp_wl_session_recovery_get_uuid(struct wl_client *client EINA_UNUSED, struc if (ec->internal || ec->uuid) return; uuid_generate(u); uuid_unparse_lower(u, uuid); - eina_stringshare_replace(&ec->uuid, uuid); zwp_e_session_recovery_send_create_uuid(resource, surface, uuid); if (ec->remember) e_remember_unuse(ec->remember); + else + { + ec->remember = e_remember_find_usable(ec); + if (ec->remember) + e_remember_apply(ec->remember, ec); + } + eina_stringshare_replace(&ec->uuid, uuid); ec->remember = e_remember_new(); e_remember_use(ec->remember); ec->remember->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE | E_REMEMBER_APPLY_DESKTOP |