[Scummvm-cvs-logs] SF.net SVN: scummvm:[47544] scummvm/trunk
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon Jan 25 03:08:29 CET 2010
Revision: 47544
http://scummvm.svn.sourceforge.net/scummvm/?rev=47544&view=rev
Author: lordhoto
Date: 2010-01-25 02:08:28 +0000 (Mon, 25 Jan 2010)
Log Message:
-----------
Fix virtual-keyboard not changing size, when the user changes the scaler while it is not visible.
Modified Paths:
--------------
scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
scummvm/trunk/common/xmlparser.cpp
Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp 2010-01-25 01:53:32 UTC (rev 47543)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp 2010-01-25 02:08:28 UTC (rev 47544)
@@ -207,7 +207,7 @@
_currentMode = newMode;
}
-void VirtualKeyboard::switchMode(const String& newMode) {
+void VirtualKeyboard::switchMode(const String &newMode) {
if (!_modes.contains(newMode)) {
warning("Keyboard mode '%s' unknown", newMode.c_str());
} else {
Modified: scummvm/trunk/common/xmlparser.cpp
===================================================================
--- scummvm/trunk/common/xmlparser.cpp 2010-01-25 01:53:32 UTC (rev 47543)
+++ scummvm/trunk/common/xmlparser.cpp 2010-01-25 02:08:28 UTC (rev 47544)
@@ -247,10 +247,12 @@
}
bool XMLParser::parse() {
-
if (_stream == 0)
return parserError("XML stream not ready for reading.");
+ // Make sure we are at the start of the stream.
+ _stream->seek(0, SEEK_SET);
+
if (_XMLkeys == 0)
buildLayout();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list