summaryrefslogtreecommitdiff
path: root/src/lib/ecore_drm
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-01-19 12:38:12 -0500
committerChris Michael <cp.michael@samsung.com>2015-01-19 12:48:41 -0500
commit28e4901d041e087f505c19bc9733ef22d31addf0 (patch)
tree970514fe17e0948294bd35bcf31ed87e186a6b81 /src/lib/ecore_drm
parent21b34d4d8488b8bf62eb6bf2deaed9df4291821b (diff)
ecore-drm: Don't init tty unless we are Not using systemd
Summary: It turns out we don't need to handle open & setup of the tty unless we are Not using systemd. This fixes an issue during enlightenment restart where we are unable to reopen the tty. @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
Diffstat (limited to 'src/lib/ecore_drm')
-rw-r--r--src/lib/ecore_drm/ecore_drm_launcher.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/lib/ecore_drm/ecore_drm_launcher.c b/src/lib/ecore_drm/ecore_drm_launcher.c
index 41f2fe1b50..8b08e3ceb7 100644
--- a/src/lib/ecore_drm/ecore_drm_launcher.c
+++ b/src/lib/ecore_drm/ecore_drm_launcher.c
@@ -123,10 +123,15 @@ ecore_drm_launcher_connect(Ecore_Drm_Device *dev)
123 } 123 }
124 } 124 }
125 125
126 if (!ecore_drm_tty_open(dev, NULL)) 126 /* NB: Hmmm, appears we don't need to open a tty if we are running
127 * with systemd support */
128 if (!logind)
127 { 129 {
128 ERR("Launcher: failed to open tty\n"); 130 if (!ecore_drm_tty_open(dev, NULL))
129 return EINA_FALSE; 131 {
132 ERR("Launcher: failed to open tty\n");
133 return EINA_FALSE;
134 }
130 } 135 }
131 136
132 /* setup handler for signals */ 137 /* setup handler for signals */
@@ -153,8 +158,13 @@ ecore_drm_launcher_disconnect(Ecore_Drm_Device *dev)
153 if (dev->tty.switch_hdlr) ecore_event_handler_del(dev->tty.switch_hdlr); 158 if (dev->tty.switch_hdlr) ecore_event_handler_del(dev->tty.switch_hdlr);
154 dev->tty.switch_hdlr = NULL; 159 dev->tty.switch_hdlr = NULL;
155 160
156 if (!ecore_drm_tty_close(dev)) 161 /* NB: Hmmm, appears we don't need to open a tty if we are running
157 ERR("Launcher: failed to close tty\n"); 162 * with systemd support */
163 if (!logind)
164 {
165 if (!ecore_drm_tty_close(dev))
166 ERR("Launcher: failed to close tty\n");
167 }
158 168
159 if (logind) 169 if (logind)
160 { 170 {