Fix failure to accept XDMCP connections due to invalid assert

diff --git a/NEWS b/NEWS
index ea86c5b8c2011271d9657af0ee966361f456e068..b141a140633cb9221c72f4692dffe3cd9532da67 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in lightdm 0.4.4
+
+    * Fix failure to accept XDMCP connections due to invalid assert
+
 Overview of changes in lightdm 0.4.3
 
     * Don't replace Plymouth if it isn't running on a valid VT

diff --git a/src/xserver.c b/src/xserver.c
index 59e8c694a864532d7bffda2b8a552371c1cdd77b..f17ada2465c5009becf2f7bacce6d279915a4e74 100644 (file)
--- a/src/xserver.c
+++ b/src/xserver.c
@@ -376,7 +376,6 @@ xserver_start (XServer *server)
 
     g_return_val_if_fail (server != NULL, FALSE);
     //g_return_val_if_fail (server->priv->pid == 0, FALSE);
-    g_return_val_if_fail (server->priv->command != NULL, FALSE);
   
     server->priv->ready = FALSE;
  
@@ -391,6 +390,8 @@ xserver_start (XServer *server)
         return TRUE;
     }
 
+    g_return_val_if_fail (server->priv->command != NULL, FALSE);
+
     /* Write the authorization file */
     write_authorization_file (server);