amy/upiwin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hackathon-dev #1

Merged
amy merged 101 commits from hackathon-dev into develop 2019-12-12 13:56:11 -07:00
Conversation 0 Commits 101 Files Changed 67 +11 -12
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4bef88aecc - Show all commits

23
src/sysinput.c
View File

@ -176,9 +176,8 @@ HRESULT Sys_enable_input(void)
if (ts_fd < 0) if (ts_fd < 0)
{ {
rc = ERRNO_AS_SCODE; rc = ERRNO_AS_SCODE;
Mq_destroy(Sys_Queue);
Log(LFATAL, "Unable to open touchscreen device %s (%08X).", Gconfig.touchscreen_device, rc); Log(LFATAL, "Unable to open touchscreen device %s (%08X).", Gconfig.touchscreen_device, rc);
return rc; goto error_0;
} }
running = 1; running = 1;
@ -186,20 +185,20 @@ HRESULT Sys_enable_input(void)
if (threadrc != 0) if (threadrc != 0)
{ {
rc = SCODE_FROM_ERRNO(threadrc); rc = SCODE_FROM_ERRNO(threadrc);
close(ts_fd);
ts_fd = -1;
Mq_destroy(Sys_Queue);
Log(LFATAL, "Unable to start system input thread (%08X).", rc); Log(LFATAL, "Unable to start system input thread (%08X).", rc);
goto error_1;
} }
if (SUCCEEDED(rc))
{
rc = Config_exitfunc(do_disable_input);
if (FAILED(rc))
do_disable_input();
}
return rc;
rc = Config_exitfunc(do_disable_input);
if (FAILED(rc))
do_disable_input();
return rc;
error_1:
close(ts_fd);
ts_fd = -1;
error_0: error_0:
Mq_destroy(Sys_Queue);
return rc; return rc;
} }