summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2014-12-06 00:38:50 +0100
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2014-12-06 00:38:50 +0100
commitdbb01a400b3bf6ecca1c2c9c1cdf1017bff286b7 (patch)
tree65c4a3fc705680dfa2d79e5a97846c2f4764792f
parente09ee7326b153316eefec9699d5f379319a17b10 (diff)
Fix the pop.
-rw-r--r--src/elm_settingspane.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/elm_settingspane.c b/src/elm_settingspane.c
index 254db8a..bcb1dda 100644
--- a/src/elm_settingspane.c
+++ b/src/elm_settingspane.c
@@ -824,13 +824,12 @@ _item_stack_pop(Evas_Object *obj)
824 { 824 {
825 _content_layout_content_hide(obj); 825 _content_layout_content_hide(obj);
826 _content_layout_content_del(obj); 826 _content_layout_content_del(obj);
827// _menu_layout_show(obj, it, _stack_item_pop_end(obj));
828 } 827 }
829 else if (_item_has_panel(it_o) && _item_has_panel(it)) 828 else if (_item_has_panel(it_o) && _item_has_panel(it))
830 { 829 {
831 _content_layout_content_del(obj); 830 _content_layout_content_del(obj);
832 _content_layout_content_set(obj, it); 831 _content_layout_content_set(obj, it);
833 if (id->par) 832 if (id->par && !_stack_item_pop_end(obj))
834 { 833 {
835 Elm_Settingspane_Item_Data *pard = eo_data_scope_get(id->par, ELM_SETTINGSPANE_ITEM_CLASS); 834 Elm_Settingspane_Item_Data *pard = eo_data_scope_get(id->par, ELM_SETTINGSPANE_ITEM_CLASS);
836 _menu_layout_show(obj, id->par, pard->par); 835 _menu_layout_show(obj, id->par, pard->par);