aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2008-11-18 13:28:27 +0100
committerFelix Domke <tmbinc@elitedvb.net>2008-11-18 13:28:27 +0100
commit09565fe7720e8e042712b42a9dc7aac2949130cb (patch)
tree485a75275b6ab329837e6a5f2e1409ae3be43f98 /lib/python/Screens
parent71c070aafe23537ee96a68dbff46246d44476869 (diff)
parentb925b5213ddc05911ca9736cc22628c876f604f6 (diff)
downloadenigma2-09565fe7720e8e042712b42a9dc7aac2949130cb.tar.gz
enigma2-09565fe7720e8e042712b42a9dc7aac2949130cb.zip
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Screens')
-rw-r--r--lib/python/Screens/Console.py3
-rw-r--r--lib/python/Screens/InfoBarGenerics.py1
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/Screens/Console.py b/lib/python/Screens/Console.py
index b57f2400..c6b156cf 100644
--- a/lib/python/Screens/Console.py
+++ b/lib/python/Screens/Console.py
@@ -55,6 +55,7 @@ class Console(Screen):
str = self["text"].getText()
str += _("Execution finished!!");
self["text"].setText(str)
+ self["text"].lastPage()
if self.finishedCallback is not None:
self.finishedCallback()
if not retval and self.closeOnSuccess:
@@ -67,4 +68,4 @@ class Console(Screen):
self.container.dataAvail.remove(self.dataAvail)
def dataAvail(self, str):
- self["text"].setText(self["text"].getText() + str)
+ self["text"].setText(self["text"].getText() + str) \ No newline at end of file
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index cdaa2c1e..eb79c74e 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1312,7 +1312,6 @@ class InfoBarJobman:
self.session.openWithCallback(self.JobViewCB, JobView, job)
def JobViewCB(self, in_background):
- from Screens.TaskView import JobView
job_manager.in_background = in_background
# depends on InfoBarExtensions