aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2011-02-18 16:37:49 +0100
committerghost <andreas.monzner@multimedia-labs.de>2011-02-18 16:37:49 +0100
commit82606cdc060c9c8c6f3f5d6909623f6eafe9076c (patch)
treefeac7c425a327e0853f3720d3c61374b3e76baad
parent84cd720642f5a45f27de25b5d27096ad69763bd3 (diff)
parent281453adb0ff8b3e86eb47aca241284d0cfd7313 (diff)
downloadenigma2-82606cdc060c9c8c6f3f5d6909623f6eafe9076c.tar.gz
enigma2-82606cdc060c9c8c6f3f5d6909623f6eafe9076c.zip
Merge branch 'bug_690_fix_oled_lcd_clear_on_shutdown' into experimental
-rw-r--r--lib/python/Screens/Standby.py9
-rw-r--r--main/enigma.cpp3
2 files changed, 3 insertions, 9 deletions
diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 1a7ebbd1..c93dd008 100644
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -160,14 +160,7 @@ class TryQuitMainloop(MessageBox):
self.conntected=False
self.session.nav.record_event.remove(self.getRecordEvent)
if value:
- # hack .. we dont like to show any other screens when this screen has closed
- self.onClose = [self.__closed]
- self.session.dialog_stack = []
- self.session.summary_stack = [None]
- MessageBox.close(self, True)
-
- def __closed(self):
- quitMainloop(self.retval)
+ quitMainloop(self.retval)
def __onShow(self):
global inTryQuitMainloop
diff --git a/main/enigma.cpp b/main/enigma.cpp
index 1cdd867b..91645d89 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -251,8 +251,9 @@ int main(int argc, char **argv)
{
gPainter p(my_lcd_dc);
- p.resetClip(eRect(0, 0, 132, 64));
+ p.resetClip(eRect(ePoint(0, 0), my_lcd_dc->size()));
p.clear();
+ p.flush();
}
return exit_code;