From: Michael Terry <michael.terry@canonical.com>
Date: Thu, 20 Oct 2016 08:53:37 +0000 (+0200)
Subject: Update vt ioctl usage
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/d4141f72afd093d220603ca82b0fd4fe286e7a92

Update vt ioctl usage
---

diff --git a/src/vt.c b/src/vt.c
index 8d31f78b..d784a8c8 100644
--- a/src/vt.c
+++ b/src/vt.c
@@ -92,12 +92,16 @@ vt_set_active (gint number)
         int n = number;
 
         if (ioctl (tty_fd, VT_ACTIVATE, n) < 0)
+        {
             g_warning ("Error using VT_ACTIVATE %d on /dev/tty0: %s", n, strerror (errno));
+            close (tty_fd);
+            return;
+        }
 
         /* Wait for the VT to become active to avoid a suspected
          * race condition somewhere between LightDM, X, ConsoleKit and the kernel.
          * See https://bugs.launchpad.net/bugs/851612 */
-        if (ioctl (tty_fd, VT_WAITACTIVE) < 0)
+        if (ioctl (tty_fd, VT_WAITACTIVE, n) < 0)
             g_warning ("Error using VT_WAITACTIVE %d on /dev/tty0: %s", n, strerror (errno));
 
         close (tty_fd);