mirror of
https://github.com/gnif/LookingGlass.git
synced 2024-11-25 14:57:20 +00:00
[client] main: make core overlays register before everything else
The display servers and renderers may want to register their own overlays in the future, as such we need g_state.overlays to be initialized to allow for this.
This commit is contained in:
parent
0af558345f
commit
a37b527bbd
@ -1261,13 +1261,6 @@ int main(int argc, char * argv[])
|
|||||||
ivshmemOptionsInit();
|
ivshmemOptionsInit();
|
||||||
egl_dynProcsInit();
|
egl_dynProcsInit();
|
||||||
|
|
||||||
// early renderer setup for option registration
|
|
||||||
for(unsigned int i = 0; i < LG_RENDERER_COUNT; ++i)
|
|
||||||
LG_Renderers[i]->setup();
|
|
||||||
|
|
||||||
for(unsigned int i = 0; i < LG_DISPLAYSERVER_COUNT; ++i)
|
|
||||||
LG_DisplayServers[i]->setup();
|
|
||||||
|
|
||||||
g_state.overlays = ll_new();
|
g_state.overlays = ll_new();
|
||||||
app_registerOverlay(&LGOverlayConfig, NULL);
|
app_registerOverlay(&LGOverlayConfig, NULL);
|
||||||
app_registerOverlay(&LGOverlayAlert , NULL);
|
app_registerOverlay(&LGOverlayAlert , NULL);
|
||||||
@ -1275,6 +1268,13 @@ int main(int argc, char * argv[])
|
|||||||
app_registerOverlay(&LGOverlayGraphs, NULL);
|
app_registerOverlay(&LGOverlayGraphs, NULL);
|
||||||
app_registerOverlay(&LGOverlayHelp , NULL);
|
app_registerOverlay(&LGOverlayHelp , NULL);
|
||||||
|
|
||||||
|
// early renderer setup for option registration
|
||||||
|
for(unsigned int i = 0; i < LG_RENDERER_COUNT; ++i)
|
||||||
|
LG_Renderers[i]->setup();
|
||||||
|
|
||||||
|
for(unsigned int i = 0; i < LG_DISPLAYSERVER_COUNT; ++i)
|
||||||
|
LG_DisplayServers[i]->setup();
|
||||||
|
|
||||||
if (!config_load(argc, argv))
|
if (!config_load(argc, argv))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user