git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more robust code
[enigma2.git]
/
lib
/
python
/
Screens
/
Screen.py
diff --git
a/lib/python/Screens/Screen.py
b/lib/python/Screens/Screen.py
index 4c4f117bad39c213775077ac8d6c58a7863277fd..f0bf773d6a28a76418984bbad84811eba4835766 100644
(file)
--- a/
lib/python/Screens/Screen.py
+++ b/
lib/python/Screens/Screen.py
@@
-1,4
+1,4
@@
-from Tools.Profile import profile
, profile_final
+from Tools.Profile import profile
profile("LOAD:GUISkin")
from Components.GUISkin import GUISkin
profile("LOAD:GUISkin")
from Components.GUISkin import GUISkin
@@
-9,11
+9,13
@@
from Components.GUIComponent import GUIComponent
class Screen(dict, GUISkin):
class Screen(dict, GUISkin):
+ False, SUSPEND_STOPS, SUSPEND_PAUSES = range(3)
ALLOW_SUSPEND = False
global_screen = None
def __init__(self, session, parent = None):
ALLOW_SUSPEND = False
global_screen = None
def __init__(self, session, parent = None):
+ dict.__init__(self)
self.skinName = self.__class__.__name__
self.session = session
self.parent = parent
self.skinName = self.__class__.__name__
self.session = session
self.parent = parent
@@
-75,10
+77,11
@@
class Screen(dict, GUISkin):
x()
def execEnd(self):
x()
def execEnd(self):
+ active_components = self.active_components
# for (name, val) in self.items():
# for (name, val) in self.items():
- for val in self.active_components:
+ self.active_components = None
+ for val in active_components:
val.execEnd()
val.execEnd()
- del self.active_components
# assert self.session != None, "execEnd on non-execing screen!"
# self.session = None
self.execing = False
# assert self.session != None, "execEnd on non-execing screen!"
# self.session = None
self.execing = False
@@
-98,18
+101,15
@@
class Screen(dict, GUISkin):
# but currently we destroy the screen afterwards
# anyway.
for val in self.renderer:
# but currently we destroy the screen afterwards
# anyway.
for val in self.renderer:
- val.disconnectAll() # disconnected converter/sources and probably destroy them
-
+ val.disconnectAll() # disconnected converter/sources and probably destroy them
. Sources will not be destroyed.
+
del self.session
for (name, val) in self.items():
val.destroy()
del self[name]
del self.session
for (name, val) in self.items():
val.destroy()
del self[name]
-
- for val in self.renderer:
- val.destroy()
-
+
self.renderer = [ ]
self.renderer = [ ]
-
+
# really delete all elements now
self.__dict__.clear()
# really delete all elements now
self.__dict__.clear()