Merge branch 'bug_690_fix_oled_lcd_clear_on_shutdown'

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 1a7ebbd1ae61b09fa7c5716cae28fe5475ad7884..94a56ee44da0d6993ce8b7c7b89930c1cbd6b9f1 100644 (file)
--- 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 1cdd867ba9e2b9a20250e36b762168300862f0f0..91645d893b9f0b694a2a91927d6ff67d59105ce1 100644 (file)
--- 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;