os: Initialize NotifyFds earlier in startup

Backported from X.org: commit ce6546337487c052b5dd3c04d3d8d4b09d691c3d Author: Keith Packard <keithp@keithp.com> Date: Tue May 31 09:38:17 2016 -0700 os: Initialize NotifyFds earlier in startup If the server calls AbortServer during the first-time initialization (which can happen if you start the server on an already using DISPLAY), then the dbus code will shut down and call the notify fd interface. If the notify fd list hasn't been initialized, the server will crash. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

os: Initialize NotifyFds earlier in startup
f315ae06 · Mike Gabriel · 761d74a6 · f315ae06
Commit f315ae06 authored Feb 24, 2017 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

osinit.c nx-X11/programs/Xserver/os/osinit.c +5 -1

No files found.
--- a/nx-X11/programs/Xserver/os/osinit.c
+++ b/nx-X11/programs/Xserver/os/osinit.c
@@ -101,10 +101,15 @@ OsInit(void)
 #endif

    if (!been_here) {
+
+	InitNotifyFds();
+
 #if !defined(__SCO__) && !defined(__CYGWIN__) && !defined(__UNIXWARE__)
 	fclose(stdin);
 	fclose(stdout);
 #endif
+
+
 	/* 
 	 * If a write of zero bytes to stderr returns non-zero, i.e. -1, 
 	 * then writing to stderr failed, and we'll write somewhere else 
@@ -203,7 +208,6 @@ OsInit(void)
 #endif
 	been_here = TRUE;
    }
-    InitNotifyFds();
    TimerInit();
 #ifdef DDXOSINIT
    OsVendorInit();