devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=32a7eecf504238dd1340272134c53ced9208d5bc
commit 32a7eecf504238dd1340272134c53ced9208d5bc Author: Chris Michael <[email protected]> Date: Tue Jan 6 11:12:54 2015 -0500 ecore-drm: Fix incorrect launcher shutdown procedure Summary: We need to clean tty handlers and close the tty Before we can call logind_disconnect as that function ends up shuttting down our dbus connection. @fix Signed-off-by: Chris Michael <[email protected]> --- src/lib/ecore_drm/ecore_drm_launcher.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/ecore_drm/ecore_drm_launcher.c b/src/lib/ecore_drm/ecore_drm_launcher.c index e630932..41f2fe1 100644 --- a/src/lib/ecore_drm/ecore_drm_launcher.c +++ b/src/lib/ecore_drm/ecore_drm_launcher.c @@ -147,20 +147,20 @@ ecore_drm_launcher_connect(Ecore_Drm_Device *dev) EAPI void ecore_drm_launcher_disconnect(Ecore_Drm_Device *dev) { - if (logind) - { - logind = EINA_FALSE; - _ecore_drm_logind_disconnect(dev); - } - - if (!ecore_drm_tty_close(dev)) - ERR("Launcher: failed to close tty\n"); - if (dev->tty.event_hdlr) ecore_event_handler_del(dev->tty.event_hdlr); dev->tty.event_hdlr = NULL; if (dev->tty.switch_hdlr) ecore_event_handler_del(dev->tty.switch_hdlr); dev->tty.switch_hdlr = NULL; + + if (!ecore_drm_tty_close(dev)) + ERR("Launcher: failed to close tty\n"); + + if (logind) + { + logind = EINA_FALSE; + _ecore_drm_logind_disconnect(dev); + } } static int --
