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>
This commit is contained in:
parent
f0756793e4
commit
ce65463374
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue
Block a user