Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d05bd5d1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-23 12:23:43 +01:00
4 changed files with 5 additions and 5 deletions

View File

@@ -896,8 +896,8 @@ void CControlAPI::RCEmCGI(CyhookHandler *hh)
#if 0
int evd = open(EVENTDEV, O_RDWR);
if (evd < 0) {
perror("opening " EVENTDEV " failed");
hh->SendError();
perror("opening event0 failed");
return;
}
if (rc_send(evd, sendcode, KEY_PRESSED) < 0) {
@@ -908,8 +908,8 @@ void CControlAPI::RCEmCGI(CyhookHandler *hh)
}
if (rc_send(evd, sendcode, KEY_RELEASED) < 0) {
perror("writing 'KEY_RELEASED' event failed");
close(evd);
hh->SendError();
close(evd);
return;
}
close(evd);