enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

ecore-drm2: perform logind connection after finding device path in ecore_drm2_device_find

This commit is contained in:
Mike Blumenkrantz 2016-05-23 12:53:49 -04:00 committed by Chris Michael
parent 7b5af2f0df
commit c1253164b2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/ecore_drm2/ecore_drm2_device.c
View File

@ -104,13 +104,6 @@ ecore_drm2_device_find(const char *seat, unsigned int tty, Eina_Bool sync)
dev = calloc(1, sizeof(Ecore_Drm2_Device));
if (!dev) return NULL;
dev->em = elput_manager_connect(seat, tty, sync);
if (!dev->em)
{
ERR("Could not connect to input manager");
goto man_err;
}
dev->path = _drm2_device_find(seat);
if (!dev->path)
{
@ -118,11 +111,18 @@ ecore_drm2_device_find(const char *seat, unsigned int tty, Eina_Bool sync)
goto path_err;
}
dev->em = elput_manager_connect(seat, tty, sync);
if (!dev->em)
{
ERR("Could not connect to input manager");
goto man_err;
}
return dev;
path_err:
elput_manager_disconnect(dev->em);
man_err:
eina_stringshare_del(dev->path);
path_err:
free(dev);
return NULL;
}