This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository enlightenment.
View the commit online.
commit c8aa703ffbc27c4471ba286e6a33743479f37c3b
Author: Alastair Poole <[email protected]>
AuthorDate: Sat Apr 25 01:09:58 2026 +0100
wizard: guard missing layout rules and clean up next_xdg_timer on shutdown
Return early in parse_rules() when rules_file is unset.
Skip page 011 safely when no layouts were parsed from rules.
Delete and null next_xdg_timer during wizard shutdown to avoid timer leaks.
---
src/modules/wizard/e_wizard.c | 2 ++
src/modules/wizard/page_011.c | 13 +++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index ffebaeb6c..91db20dc2 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -70,6 +70,8 @@ wizard_shutdown(void)
if (next_timer) ecore_timer_del(next_timer);
next_timer = NULL;
+ if (next_xdg_timer) ecore_timer_del(next_xdg_timer);
+ next_xdg_timer = NULL;
E_FREE_LIST(handlers, ecore_event_handler_del);
return 1;
}
diff --git a/src/modules/wizard/page_011.c b/src/modules/wizard/page_011.c
index fb08ff1d1..073f78a8c 100644
--- a/src/modules/wizard/page_011.c
+++ b/src/modules/wizard/page_011.c
@@ -63,7 +63,10 @@ int
parse_rules(void)
{
char buf[4096];
- FILE *f = fopen(rules_file, "r");
+ FILE *f;
+
+ if (!rules_file) return 0;
+ f = fopen(rules_file, "r");
if (!f) return 0;
for (;; )
@@ -202,6 +205,13 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
sel_it = it;
}
+ if (!layouts)
+ {
+ /* No rules file parsed; skip page safely. */
+ evas_object_del(of);
+ return 0;
+ }
+
evas_object_show(ob);
evas_object_show(of);
E_EXPAND(of);
@@ -230,4 +240,3 @@ wizard_page_apply(E_Wizard_Page *pg EINA_UNUSED)
implement_layout();
return 1;
}
-
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
