git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
python
/
Components
/
Console.py
diff --git
a/lib/python/Components/Console.py
b/lib/python/Components/Console.py
index c5fa5f9810456c3ec051e4146c3edeb3e3f46ca8..136d10d089586f7392f8dc8dc67758658389458d 100644
(file)
--- a/
lib/python/Components/Console.py
+++ b/
lib/python/Components/Console.py
@@
-8,7
+8,7
@@
class Console(object):
self.callbacks = {}
self.extra_args = {}
self.callbacks = {}
self.extra_args = {}
- def ePopen(self, cmd, callback, extra_args=[]):
+ def ePopen(self, cmd, callback
=None
, extra_args=[]):
name = cmd
i = 0
while self.appContainers.has_key(name):
name = cmd
i = 0
while self.appContainers.has_key(name):
@@
-50,5
+50,6
@@
class Console(object):
extra_args = self.extra_args[name]
del self.appContainers[name]
del self.extra_args[name]
extra_args = self.extra_args[name]
del self.appContainers[name]
del self.extra_args[name]
- self.callbacks[name](data,retval,extra_args)
+ if self.callbacks[name]:
+ self.callbacks[name](data,retval,extra_args)
del self.callbacks[name]
del self.callbacks[name]