summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2016-05-31 09:38:17 -0700
committerKeith Packard <keithp@keithp.com>2016-06-01 10:31:52 -0700
commitce6546337487c052b5dd3c04d3d8d4b09d691c3d (patch)
tree0d0f6d4ebd7baf2e70323b250f667012a2d5754e
parentf0756793e4c30278164d7a5cc483ce6a311c58dc (diff)
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>
-rw-r--r--os/osinit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/os/osinit.c b/os/osinit.c
index 54b39a0e8..629fef569 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -195,6 +195,7 @@ OsInit(void)
#ifdef BUSFAULT
busfault_init();
#endif
+ InitNotifyFds();
#ifdef HAVE_BACKTRACE
/*
@@ -314,7 +315,6 @@ OsInit(void)
LockServer();
been_here = TRUE;
}
- InitNotifyFds();
TimerInit();
OsVendorInit();
OsResetSignals();