[Scummvm-cvs-logs] SF.net SVN: scummvm:[53008] scummvm/trunk/engines/sci/graphics/controls.cpp
wjpalenstijn at users.sourceforge.net
wjpalenstijn at users.sourceforge.net
Mon Oct 4 01:56:17 CEST 2010
Revision: 53008
http://scummvm.svn.sourceforge.net/scummvm/?rev=53008&view=rev
Author: wjpalenstijn
Date: 2010-10-03 23:56:17 +0000 (Sun, 03 Oct 2010)
Log Message:
-----------
SCI: Fix AltInput crash in non-parser games
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/controls.cpp
Modified: scummvm/trunk/engines/sci/graphics/controls.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/controls.cpp 2010-10-03 23:55:28 UTC (rev 53007)
+++ scummvm/trunk/engines/sci/graphics/controls.cpp 2010-10-03 23:56:17 UTC (rev 53008)
@@ -225,7 +225,7 @@
}
}
- if (!textChanged && oldCursorPos != cursorPos) {
+ if (g_sci->getVocabulary() && !textChanged && oldCursorPos != cursorPos) {
assert(!textAddChar);
textChanged = g_sci->getVocabulary()->checkAltInput(text, cursorPos);
}
@@ -257,7 +257,8 @@
// Note: the following checkAltInput call might make the text
// too wide to fit, but SSCI fails to check that too.
}
- g_sci->getVocabulary()->checkAltInput(text, cursorPos);
+ if (g_sci->getVocabulary())
+ g_sci->getVocabulary()->checkAltInput(text, cursorPos);
texteditCursorErase();
_paint16->eraseRect(rect);
_text16->Box(text.c_str(), 0, rect, SCI_TEXT16_ALIGNMENT_LEFT, -1);
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