Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 06:47:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] spice: fix spice shutdown race

Browse Source 
Fixes #960
This commit is contained in:
Geoffrey McRae 2022-05-15 16:28:37 +10:00
parent 0a9a9ed57e
commit 32fbcaffd2
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
client/src/main.c
View File

@ -920,6 +920,19 @@ int spiceThread(void * arg)
} }
} }
// send key up events for any pressed keys
if (g_params.useSpiceInput)
{
for(int scancode = 0; scancode < KEY_MAX; ++scancode)
if (g_state.keyDown[scancode])
{
g_state.keyDown[scancode] = false;
purespice_keyUp(scancode);
}
}
purespice_disconnect();
end: end:
audio_free(); audio_free();
@ -1540,6 +1553,10 @@ restart:
static void lg_shutdown(void) static void lg_shutdown(void)
{ {
g_state.state = APP_STATE_SHUTDOWN; g_state.state = APP_STATE_SHUTDOWN;
if (t_spice)
lgJoinThread(t_spice, NULL);
if (t_render) if (t_render)
{ {
if (g_state.jitRender && g_state.ds->stopWaitFrame) if (g_state.jitRender && g_state.ds->stopWaitFrame)
@ -1563,21 +1580,6 @@ static void lg_shutdown(void)
e_startup = NULL; e_startup = NULL;
} }
// if spice is still connected send key up events for any pressed keys
if (g_params.useSpiceInput)
{
for(int scancode = 0; scancode < KEY_MAX; ++scancode)
if (g_state.keyDown[scancode])
{
g_state.keyDown[scancode] = false;
purespice_keyUp(scancode);
}
purespice_disconnect();
if (t_spice)
lgJoinThread(t_spice, NULL);
}
if (g_state.ds) if (g_state.ds)
g_state.ds->shutdown(); g_state.ds->shutdown();