[PATCH] fix tty_destroy
Tim Wiederhake
twied at gmx.net
Tue Jan 25 03:01:00 PST 2011
fixes segfault when active tty could not be opened
fixes copy-paste mistake.
---
compositor/tty.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/compositor/tty.c b/compositor/tty.c
index 70c319d..6314b14 100644
--- a/compositor/tty.c
+++ b/compositor/tty.c
@@ -148,12 +148,12 @@ tty_create(struct wlsc_compositor *compositor)
void
tty_destroy(struct tty *tty)
{
- int ret;
+ if(!tty)
+ return;
- ret = ioctl(tty->fd, KDSETMODE, KD_TEXT);
- if (ret)
+ if (ioctl(tty->fd, KDSETMODE, KD_TEXT))
fprintf(stderr,
- "failed to set KD_GRAPHICS mode on tty: %m\n");
+ "failed to set KD_TEXT mode on tty: %m\n");
if (tcsetattr(tty->fd, TCSANOW, &tty->terminal_attributes) < 0)
fprintf(stderr,
--
1.7.2.3
More information about the wayland-devel
mailing list