diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-09-20 15:35:42 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-01-02 19:43:58 +0000 |
| commit | cf3e595c6fecf18dc313400394a2934c358b7f71 (patch) | |
| tree | c7a0503700f7abfc28911ab7bd877b9873766632 /dix | |
| parent | 8f63f73095db6a58c5f322c178b3ef25a7ef67a3 (diff) | |
os: -displayfd option fixes
Rearrange init order to avoid null DISPLAY crash and correctly use DISPLAY in
default logfile name when logfile isn't specified on command line.
Do a bit more logging about what we are trying to do.
Fix null DISPLAY crash when stderr is closed.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dix/main.c b/dix/main.c index a10bd828c..bbed32241 100644 --- a/dix/main.c +++ b/dix/main.c @@ -160,8 +160,6 @@ dix_main(int argc, char *argv[], char *envp[]) DPMSPowerLevel = 0; #endif InitBlockAndWakeupHandlers(); - /* Perform any operating system dependent initializations you'd like */ - OsInit(); if (serverGeneration == 1) { CreateWellKnownSockets(); for (i = 1; i < MAXCLIENTS; i++) @@ -173,6 +171,8 @@ dix_main(int argc, char *argv[], char *envp[]) } else ResetWellKnownSockets(); + /* Perform any operating system dependent initializations you'd like */ + OsInit(); clients[0] = serverClient; currentMaxClients = 1; |