Move config_init() after CreateWellKnownSockets() and InitCoreDevices()
config_init() can now add devices directly instead of scheduling a timer. Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
8861407878
commit
3fad969a90
|
@ -168,7 +168,6 @@ int main(int argc, char *argv[], char *envp[])
|
|||
InitBlockAndWakeupHandlers();
|
||||
/* Perform any operating system dependent initializations you'd like */
|
||||
OsInit();
|
||||
config_init();
|
||||
if(serverGeneration == 1)
|
||||
{
|
||||
CreateWellKnownSockets();
|
||||
|
@ -254,6 +253,7 @@ int main(int argc, char *argv[], char *envp[])
|
|||
InitRootWindow(WindowTable[i]);
|
||||
|
||||
InitCoreDevices();
|
||||
config_init();
|
||||
InitInput(argc, argv);
|
||||
InitAndStartDevices();
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user