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] don't report a spice error on graceful shutdown

Browse Source
This commit is contained in:
Geoffrey McRae 2021-12-30 21:02:53 +11:00
parent d43126f433
commit c8b4787cb1
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/src/main.c
View File

@ -769,15 +769,15 @@ int main_frameThread(void * unused)
int spiceThread(void * arg) int spiceThread(void * arg)
{ {
while(g_state.state != APP_STATE_SHUTDOWN) while(g_state.state != APP_STATE_SHUTDOWN)
if (!purespice_process(100))
{ {
if (g_state.state != APP_STATE_SHUTDOWN) PSStatus status;
if ((status = purespice_process(100)) != PS_STATUS_RUN)
{ {
g_state.state = APP_STATE_SHUTDOWN; if (status != PS_STATUS_SHUTDOWN)
DEBUG_ERROR("failed to process spice messages"); DEBUG_ERROR("failed to process spice messages");
}
break; break;
} }
}
if (g_state.audioDev) if (g_state.audioDev)
{ {
@ -1041,12 +1041,16 @@ static int lg_run(void)
} }
while(g_state.state != APP_STATE_SHUTDOWN && !purespice_ready()) while(g_state.state != APP_STATE_SHUTDOWN && !purespice_ready())
if (!purespice_process(1000)) {
PSStatus status;
if ((status = purespice_process(1000)) != PS_STATUS_RUN)
{ {
g_state.state = APP_STATE_SHUTDOWN; g_state.state = APP_STATE_SHUTDOWN;
if (status != PS_STATUS_SHUTDOWN)
DEBUG_ERROR("Failed to process spice messages"); DEBUG_ERROR("Failed to process spice messages");
return -1; return -1;
} }
}
purespice_mouseMode(true); purespice_mouseMode(true);
if (!lgCreateThread("spiceThread", spiceThread, NULL, &t_spice)) if (!lgCreateThread("spiceThread", spiceThread, NULL, &t_spice))

2
repos/PureSpice

@ -1 +1 @@
Subproject commit a9664f731ab720ff890c35225f271048addfd54d Subproject commit d1f86f739974851afc5f98e13ea74ba6c96f805b