mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-01-08 21:33:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] wayland: free presentation objects

Browse source 
Since the display server owns a graph, it was necessary to move the overlay
graphs destruction so that it happens after display server destruction.
This commit is contained in:
Quantum 2021-09-10 21:17:51 -04:00 committed by Geoffrey McRae
parent 09d93abf1a
commit 72f3a9f3cf
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/displayservers/Wayland/wayland.c
View file

@ -130,6 +130,7 @@ static void waylandFree(void)
{ {
waylandIdleFree(); waylandIdleFree();
waylandWindowFree(); waylandWindowFree();
waylandPresentationFree();
waylandInputFree(); waylandInputFree();
waylandOutputFree(); waylandOutputFree();
waylandRegistryFree(); waylandRegistryFree();

14
client/src/main.c
View file

@ -1209,13 +1209,6 @@ static void lg_shutdown(void)
lgmpClientFree(&g_state.lgmp); lgmpClientFree(&g_state.lgmp);
if (g_state.overlays)
{
app_freeOverlays();
ll_free(g_state.overlays);
g_state.overlays = NULL;
}
if (g_state.frameEvent) if (g_state.frameEvent)
{ {
lgFreeEvent(g_state.frameEvent); lgFreeEvent(g_state.frameEvent);
@ -1257,6 +1250,13 @@ static void lg_shutdown(void)
if (g_state.dsInitialized) if (g_state.dsInitialized)
g_state.ds->free(); g_state.ds->free();
if (g_state.overlays)
{
app_freeOverlays();
ll_free(g_state.overlays);
g_state.overlays = NULL;
}
ivshmemClose(&g_state.shm); ivshmemClose(&g_state.shm);
// free metrics ringbuffers // free metrics ringbuffers