From bb28ed7b7a10535c4f3f275b3bef3643f9ce46d3 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 28 Jun 2009 19:58:11 +0000
Subject: Changed OSystem::setWindowCaption to expect ISO LATIN 1 encoded
 input; also intentionally broke WinCE and Symbian ports (in an obvious way
 that can be undo by commenting out some text) -- hopefully this will get the
 maintainers' attention during the next release cycle, unlike my emails

svn-id: r41932
---
 backends/platform/symbian/src/SymbianOS.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/platform/symbian/src/SymbianOS.cpp')

diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 452f730110..6a8a46df07 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -472,6 +472,7 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev, Common::Event &event) {
 void OSystem_SDL_Symbian::setWindowCaption(const char *caption) {
 	OSystem_SDL::setWindowCaption(caption);
 	check_mappings();
+FIXME: move check_mappings() call to engineInit() & engineDone()
 }
 
 void OSystem_SDL_Symbian::check_mappings() {
-- 
cgit v1.2.3


From 4b850a2c0357aa2d94cfc2fcf5d05ed0903278e5 Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Wed, 1 Jul 2009 20:02:33 +0000
Subject: Move action inits to engineInit and engineDone callbacks.

svn-id: r42007
---
 backends/platform/symbian/src/SymbianOS.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'backends/platform/symbian/src/SymbianOS.cpp')

diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 6a8a46df07..7af1cade8c 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -471,8 +471,16 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev, Common::Event &event) {
 
 void OSystem_SDL_Symbian::setWindowCaption(const char *caption) {
 	OSystem_SDL::setWindowCaption(caption);
+}
+
+void OSystem_SDL_Symbian::engineInit() {
+	// Check mappings for the engine just started
 	check_mappings();
-FIXME: move check_mappings() call to engineInit() & engineDone()
+}
+
+void OSystem_SDL_Symbian::engineDone() {
+	// Need to reset engine to basic state after an engine has been running
+	GUI::Actions::Instance()->initInstanceMain(this);
 }
 
 void OSystem_SDL_Symbian::check_mappings() {
-- 
cgit v1.2.3