discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=043a0b13bb446704be37813376b2b81d0b21eab5
commit 043a0b13bb446704be37813376b2b81d0b21eab5
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Thu Jul 30 13:15:50 2015 -0400
flip conditional in wizard xdg events to call xdg function first
when curpage was not set, the xdg checking function would never be run,
preventing the wizard from advancing
fix T2622
---
src/modules/wizard/e_wizard.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index 9a9d072..ddbc553 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -397,7 +397,7 @@ _e_wizard_cb_desktops_update(void *data EINA_UNUSED, int
ev_type EINA_UNUSED, vo
if ((e) && (e->error))
xdg_error = EINA_TRUE;
got_desktops = EINA_TRUE;
- if (curpage && _e_wizard_check_xdg())
+ if (_e_wizard_check_xdg() && curpage)
_e_wizard_next_xdg();
return ECORE_CALLBACK_PASS_ON;
}
@@ -406,7 +406,7 @@ static Eina_Bool
_e_wizard_cb_icons_update(void *data EINA_UNUSED, int ev_type EINA_UNUSED,
void *ev EINA_UNUSED)
{
got_icons = EINA_TRUE;
- if (curpage && _e_wizard_check_xdg())
+ if (_e_wizard_check_xdg() && curpage)
_e_wizard_next_xdg();
return ECORE_CALLBACK_PASS_ON;
}
--
