discomfitor pushed a commit to branch enlightenment-0.18.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=bc648476b3218e889c161f6fc648cafccff6558f

commit bc648476b3218e889c161f6fc648cafccff6558f
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Wed Jan 1 14:25:27 2014 -0500

    bugfix: no more crashes when being a jerk with Navigate menu scrolling
    
    this really only happens if you're TRYING to break things, but don't assume 
parent menu item is active item since it might not be
---
 src/modules/fileman/e_mod_menu.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c
index b9d1b00..2bd99db 100644
--- a/src/modules/fileman/e_mod_menu.c
+++ b/src/modules/fileman/e_mod_menu.c
@@ -1,5 +1,4 @@
-#include "e_mod_main.h"
-#include "e_fm_device.h"
+#include "e_mod_main.h" include "e_fm_device.h"
 
 static void _e_mod_menu_populate(void *d, E_Menu *m __UNUSED__, E_Menu_Item 
*mi);
 
@@ -240,7 +239,7 @@ _e_mod_menu_populate_done(void *data, Eio_File *handler 
__UNUSED__)
         mi = e_menu_item_new(m);
         e_menu_item_label_set(mi, _("No listable items"));
         dev = e_object_data_get(data);
-        path = e_object_data_get(E_OBJECT(e_menu_item_active_get()));
+        path = e_object_data_get(E_OBJECT(m->parent_item));
         e_object_data_set(E_OBJECT(mi), eina_stringshare_ref(path));
         if (dev && (dev[0] == '/'))
           e_menu_item_callback_set(mi, _e_mod_menu_populate_cb, dev);

-- 


Reply via email to