Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
menus.c
Log Message:
Fix infinite loop when reloading menus.
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -3 -r1.287 -r1.288
--- menus.c 10 Sep 2007 20:26:53 -0000 1.287
+++ menus.c 29 Sep 2007 16:37:04 -0000 1.288
@@ -554,7 +554,7 @@
if (!menu_list)
menu_list = ecore_list_new();
- ecore_list_prepend(menu_list, m);
+ ecore_list_append(menu_list, m);
return m;
}
@@ -569,6 +569,7 @@
return;
MenuHide(m);
+ MenuEmpty(m, 1);
if (m->ref_count)
return;
@@ -578,8 +579,6 @@
if (m->win)
EDestroyWindow(m->win);
- MenuEmpty(m, 1);
-
if (m->name)
Efree(m->name);
if (m->alias)
@@ -1060,6 +1059,8 @@
ECORE_LIST_FOR_EACH(menu_list, m)
{
if (m->internal)
+ continue;
+ if (m->ref_count)
continue;
MenuDestroy(m);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
