From: Tim Wiederhake <twied@gmx.net>
Date: Tue, 25 Jan 2011 11:01:00 +0000 (+0100)
Subject: fix tty_destroy
X-Git-Tag: 0.85.0~636
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70af98c57614307a427843b2f0bd6d99ed187c58;p=platform%2Fupstream%2Fweston.git

fix tty_destroy

fixes segfault when active tty could not be opened
fixes copy-paste mistake.
---

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,