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

fix for bug #836418 (Crash when saving with blank name): GUI now uses a default savegame name if non is given

Browse source 
svn-id: r11154
This commit is contained in:
Max Horn 2003-11-05 12:48:42 +00:00
parent cfcee0f673
commit e20bf2cd63
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
scumm/dialogs.cpp
View file

@ -225,12 +225,9 @@ void SaveLoadChooser::handleCommand(CommandSender *sender, uint32 cmd, uint32 da
case kListItemActivatedCmd: case kListItemActivatedCmd:
case kListItemDoubleClickedCmd: case kListItemDoubleClickedCmd:
if (selItem >= 0) { if (selItem >= 0) {
if (!getResultString().isEmpty()) { if (_saveMode || !getResultString().isEmpty()) {
setResult(selItem); setResult(selItem);
close(); close();
} else if (_saveMode) {
// Start editing the selected item, for saving
_list->startEditMode();
} }
} }
break; break;
@ -238,7 +235,10 @@ void SaveLoadChooser::handleCommand(CommandSender *sender, uint32 cmd, uint32 da
if (_saveMode) { if (_saveMode) {
_list->startEditMode(); _list->startEditMode();
} }
_chooseButton->setEnabled(selItem >= 0); // Disable button if nothing is selected, or (in load mode) if an empty
// list item is selected. We allow choosing an empty item in save mode
// because we then just assign a default name.
_chooseButton->setEnabled(selItem >= 0 && (_saveMode || !getResultString().isEmpty()));
_chooseButton->draw(); _chooseButton->draw();
break; break;
default: default:
@ -365,7 +365,16 @@ void MainMenuDialog::save() {
SaveLoadChooser dialog("Save game:", generateSavegameList(_scumm, true), "Save", true); SaveLoadChooser dialog("Save game:", generateSavegameList(_scumm, true), "Save", true);
idx = dialog.runModal(); idx = dialog.runModal();
if (idx >= 0) { if (idx >= 0) {
_scumm->requestSave(idx + 1, dialog.getResultString().c_str()); const String &result = dialog.getResultString();
char buffer[20];
const char *str;
if (result.isEmpty()) {
// If the user was lazy and entered no save name, come up with a default name.
sprintf(buffer, "Save %d", idx + 1);
str = buffer;
} else
str = result.c_str();
_scumm->requestSave(idx + 1, str);
close(); close();
} }
} }