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 <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-01-06 11:12:54 -05:00
parent 5eb11e1285
commit 32a7eecf50
1 changed files with 9 additions and 9 deletions

View File

@ -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