From: ghost <andreas.monzner@multimedia-labs.de>
Date: Tue, 22 Feb 2011 18:34:05 +0000 (+0100)
Subject: Merge branch 'bug_690_fix_oled_lcd_clear_on_shutdown'
X-Git-Tag: master-2011.03~4^2~1
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/50d5aff4b1e51eb3b0e014b0b0d519fbdb63c844?hp=1e4c82ee8d55cd1fc22da279eecdfb6a25521eb5

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 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;