git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix install path
[enigma2.git]
/
lib
/
base
/
ebase.cpp
diff --git
a/lib/base/ebase.cpp
b/lib/base/ebase.cpp
index 00ecb345128c8bccd5b2b3a740f2fe764617e4b2..7a57d533acb511a2b7b1c6366b5dfb074590c89f 100644
(file)
--- a/
lib/base/ebase.cpp
+++ b/
lib/base/ebase.cpp
@@
-157,7
+157,7
@@
int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, PyObje
poll_timeout /= 1000;
}
poll_timeout /= 1000;
}
- if ((user_timeout > 0) && (poll_timeout > user_timeout))
+ if ((user_timeout > 0) && (poll_timeout >
0) && ((unsigned int)poll_timeout >
user_timeout))
{
poll_timeout = user_timeout;
return_reason = 1;
{
poll_timeout = user_timeout;
return_reason = 1;
@@
-333,6
+333,13
@@
int eMainloop::runLoop()
PyObject *eMainloop::poll(PyObject *timeout, PyObject *dict)
{
PyObject *res = 0;
PyObject *eMainloop::poll(PyObject *timeout, PyObject *dict)
{
PyObject *res = 0;
+
+ if (app_quit_now)
+ {
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
+
int user_timeout = (timeout == Py_None) ? 0 : PyInt_AsLong(timeout);
iterate(user_timeout, &res, dict);
int user_timeout = (timeout == Py_None) ? 0 : PyInt_AsLong(timeout);
iterate(user_timeout, &res, dict);