git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
epgcache.cpp: fix segfault on unknown arg
[enigma2.git]
/
lib
/
driver
/
rc.cpp
diff --git
a/lib/driver/rc.cpp
b/lib/driver/rc.cpp
index 43c1f2b2e6aaf5d66a50193131f647835b218875..c7acd1138a1b35bc10c937e72df8e0d53453ff7d 100644
(file)
--- a/
lib/driver/rc.cpp
+++ b/
lib/driver/rc.cpp
@@
-79,7
+79,7
@@
eRCShortDriver::eRCShortDriver(const char *filename): eRCDriver(eRCInput::getIns
sn=0;
} else
{
sn=0;
} else
{
- sn=
new eSocketNotifier
(eApp, handle, eSocketNotifier::Read);
+ sn=
eSocketNotifier::create
(eApp, handle, eSocketNotifier::Read);
CONNECT(sn->activated, eRCShortDriver::keyPressed);
eRCInput::getInstance()->setFile(handle);
}
CONNECT(sn->activated, eRCShortDriver::keyPressed);
eRCInput::getInstance()->setFile(handle);
}
@@
-89,8
+89,6
@@
eRCShortDriver::~eRCShortDriver()
{
if (handle>=0)
close(handle);
{
if (handle>=0)
close(handle);
- if (sn)
- delete sn;
}
void eRCInputEventDriver::keyPressed(int)
}
void eRCInputEventDriver::keyPressed(int)
@@
-102,7
+100,7
@@
void eRCInputEventDriver::keyPressed(int)
break;
if (enabled && !input->islocked())
for (std::list<eRCDevice*>::iterator i(listeners.begin()); i!=listeners.end(); ++i)
break;
if (enabled && !input->islocked())
for (std::list<eRCDevice*>::iterator i(listeners.begin()); i!=listeners.end(); ++i)
- (*i)->handleCode((
int
)&ev);
+ (*i)->handleCode((
long
)&ev);
}
}
}
}
@@
-115,7
+113,7
@@
eRCInputEventDriver::eRCInputEventDriver(const char *filename): eRCDriver(eRCInp
sn=0;
} else
{
sn=0;
} else
{
- sn=
new eSocketNotifier
(eApp, handle, eSocketNotifier::Read);
+ sn=
eSocketNotifier::create
(eApp, handle, eSocketNotifier::Read);
CONNECT(sn->activated, eRCInputEventDriver::keyPressed);
eRCInput::getInstance()->setFile(handle);
}
CONNECT(sn->activated, eRCInputEventDriver::keyPressed);
eRCInput::getInstance()->setFile(handle);
}
@@
-133,8
+131,6
@@
eRCInputEventDriver::~eRCInputEventDriver()
{
if (handle>=0)
close(handle);
{
if (handle>=0)
close(handle);
- if (sn)
- delete sn;
}
eRCConfig::eRCConfig()
}
eRCConfig::eRCConfig()