correctly handle applying of non-SR remember in remember config
fix T4512
This commit is contained in:
parent
e365848406
commit
62068912e9
|
@ -418,7 +418,10 @@ _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 */
|
/* Actually take our cfdata settings and apply them in real life */
|
||||||
E_Client *ec = cfdata->client;
|
E_Client *ec = cfdata->client;
|
||||||
E_Remember *rem = cfdata->backup_rem ?: ec->remember;
|
E_Remember *rem = ec->remember;
|
||||||
|
|
||||||
|
if (rem && (rem->apply & E_REMEMBER_APPLY_UUID))
|
||||||
|
rem = cfdata->backup_rem;
|
||||||
|
|
||||||
if (cfdata->mode == MODE_NOTHING)
|
if (cfdata->mode == MODE_NOTHING)
|
||||||
{
|
{
|
||||||
|
@ -434,14 +437,10 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata
|
||||||
if (!rem)
|
if (!rem)
|
||||||
{
|
{
|
||||||
rem = e_remember_new();
|
rem = e_remember_new();
|
||||||
if (rem)
|
if (!rem) return 0;
|
||||||
{
|
cfdata->applied = 0;
|
||||||
if ((!ec->remember) || (!(ec->remember->apply & E_REMEMBER_APPLY_UUID)))
|
if (ec->remember && (ec->remember->apply & E_REMEMBER_APPLY_UUID))
|
||||||
ec->remember = rem;
|
cfdata->backup_rem = rem;
|
||||||
cfdata->applied = 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
e_remember_default_match_set(rem, cfdata->client);
|
e_remember_default_match_set(rem, cfdata->client);
|
||||||
|
|
Loading…
Reference in New Issue