Merge lp:~a-j-buxton/lightdm/vt-double-unref-fix into lp:lightdm

[Alistair Buxton]

Fix the possible double unref'ing of VTs.

Fix the possible double unref'ing of VTs. eg: Display 1 shuts down, unref'ing the VT. Display 2 starts, ref'ing the now-free VT. Then finalize() is called on display 1, which unref's the VT again, leaving it free for any future displays to claim, even though display 2 is still using it.

[Robert Ancell (robert-ancell)]

Thanks Alistair!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/x-server-local.c'
--- src/x-server-local.c	2013-10-14 23:22:46 +0000
+++ src/x-server-local.c	2013-11-29 17:18:27 +0000
@@ -178,7 +178,7 @@
 x_server_local_set_vt (XServerLocal *server, gint vt)
 {
     g_return_if_fail (server != NULL);
-    if (server->priv->vt > 0)
+    if (server->priv->have_vt_ref)
         vt_unref (server->priv->vt);
     server->priv->have_vt_ref = FALSE;
     server->priv->vt = vt;
@@ -586,7 +586,7 @@
     g_free (self->priv->mir_id);
     g_free (self->priv->mir_socket);
     g_free (self->priv->authority_file);
-    if (self->priv->vt > 0)
+    if (self->priv->have_vt_ref)
         vt_unref (self->priv->vt);
     g_free (self->priv->background);