thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

err, *strnlen(,,3)* used to check for empty strings? I think not :-)

Browse source 
svn-id: r11190
This commit is contained in:
Max Horn 2003-11-07 14:17:34 +00:00
parent e9eb92e201
commit 496d19d461
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
base/main.cpp
View file

@ -258,17 +258,15 @@ int main(int argc, char *argv[]) {
if (detector.detectMain()) { if (detector.detectMain()) {
// Set the window caption to the game name // Set the window caption to the game name
prop.caption = ConfMan.get("description", detector._targetName).c_str(); Common::String caption(ConfMan.get("description", detector._targetName));
if (strnlen(prop.caption, 3) == 0) if (caption.isEmpty() && detector._game.description)
prop.caption = detector._game.description; caption = detector._game.description;
if (strnlen(prop.caption, 3) == 0) if (caption.isEmpty())
prop.caption = detector._targetName.c_str(); caption = detector._targetName;
if (strnlen(prop.caption, 3) != 0) if (!caption.isEmpty()) {
prop.caption = caption.c_str();
system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop); system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop);
}
// FIXME: It seem not logical that we first might set the gfx mode to
// 1x, and then immediately after might override it again. We probably
// should combine both checks into one.
// See if the game should default to 1x scaler // See if the game should default to 1x scaler
if (!ConfMan.hasKey("gfx_mode", detector._targetName) && if (!ConfMan.hasKey("gfx_mode", detector._targetName) &&