diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2011-02-22 19:34:05 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2011-02-22 19:34:05 +0100 |
| commit | 50d5aff4b1e51eb3b0e014b0b0d519fbdb63c844 (patch) | |
| tree | 0951bd4892cb8fd69a14fbc1326e0e61a5e97f82 | |
| parent | 1e4c82ee8d55cd1fc22da279eecdfb6a25521eb5 (diff) | |
| parent | dd8a62a39c055230364641b7413ca34b2f00e51c (diff) | |
| download | enigma2-50d5aff4b1e51eb3b0e014b0b0d519fbdb63c844.tar.gz enigma2-50d5aff4b1e51eb3b0e014b0b0d519fbdb63c844.zip | |
Merge branch 'bug_690_fix_oled_lcd_clear_on_shutdown'
| -rw-r--r-- | lib/python/Screens/Standby.py | 11 | ||||
| -rw-r--r-- | main/enigma.cpp | 3 |
2 files changed, 5 insertions, 9 deletions
diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py index 1a7ebbd1..94a56ee4 100644 --- a/lib/python/Screens/Standby.py +++ b/lib/python/Screens/Standby.py @@ -160,14 +160,9 @@ 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) + else: + MessageBox.close(self, True) 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; |