Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        menus.c 


Log Message:
Fix segv on menu reload.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -3 -r1.124 -r1.125
--- menus.c     21 Apr 2004 20:51:57 -0000      1.124
+++ menus.c     22 Apr 2004 20:55:02 -0000      1.125
@@ -113,14 +113,6 @@
    if (m->win)
       EUnmapWindow(disp, m->win);
 
-   ewin = FindEwinSpawningMenu(m);
-   if (ewin)
-      ewin->shownmenu = 0;
-
-   ewin = FindEwinByMenu(m);
-   if (ewin)
-      HideEwin(ewin);
-
    if (m->sel_item)
      {
        m->sel_item->state = STATE_NORMAL;
@@ -131,7 +123,16 @@
    m->stuck = 0;
    m->shown = 0;
 
-   EwinWithdraw(ewin);
+   ewin = FindEwinSpawningMenu(m);
+   if (ewin)
+      ewin->shownmenu = 0;
+
+   ewin = FindEwinByMenu(m);
+   if (ewin)
+     {
+       HideEwin(ewin);
+       EwinWithdraw(ewin);
+     }
 
    EDBUG_RETURN_;
 }




-------------------------------------------------------
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to