[EGIT] [core/enlightenment] enlightenment-0.19 01/01: wizard: Prevent crash

2015-07-03 Thread Derek Foreman
discomfitor pushed a commit to branch enlightenment-0.19.

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

commit 01ef4980d721aba0e918bc613bf7d00c0b0ace76
Author: Derek Foreman der...@osg.samsung.com
Date:   Fri Jul 3 11:55:40 2015 -0400

wizard: Prevent crash

Summary: If we get here when curpage is NULL, we'll crash later, so we 
should test for it.

Reviewers: zmike

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D2793
---
 src/modules/wizard/e_wizard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index 9e93581..b56b52a 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -410,7 +410,7 @@ static Eina_Bool
 _e_wizard_cb_icons_update(void *data __UNUSED__, int ev_type __UNUSED__, void 
*ev __UNUSED__)
 {
got_icons = EINA_TRUE;
-   if (_e_wizard_check_xdg())
+   if (curpage  _e_wizard_check_xdg())
  _e_wizard_next_xdg();
return ECORE_CALLBACK_PASS_ON;
 }

-- 




[EGIT] [core/enlightenment] enlightenment-0.19 01/01: wizard: Prevent crash

2015-07-02 Thread Derek Foreman
discomfitor pushed a commit to branch enlightenment-0.19.

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

commit c9958e8e039c9b1b5e815a26d120867317a26a5c
Author: Derek Foreman der...@osg.samsung.com
Date:   Thu Jul 2 18:11:27 2015 -0400

wizard: Prevent crash

Summary: If we get here when curpage is NULL, we'll crash later, so we 
should test for it.

Reviewers: zmike

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D2789
---
 src/modules/wizard/e_wizard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index 4a666e9..9e93581 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -401,7 +401,7 @@ _e_wizard_cb_desktops_update(void *data __UNUSED__, int 
ev_type __UNUSED__, void
if ((e)  (e-error))
  xdg_error = EINA_TRUE;
got_desktops = EINA_TRUE;
-   if (_e_wizard_check_xdg())
+   if (curpage  _e_wizard_check_xdg())
  _e_wizard_next_xdg();
return ECORE_CALLBACK_PASS_ON;
 }

--