[Scummvm-git-logs] scummvm master -> 0425dff8245fd07329753a1f9c9cf91b4e79c534

[criezy]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5867d5420f GUI: Fix clicking in an empty space in the Grid Load dialog
626d0ed4b6 GUI: Fix assert when double clicking on item in list save dialog
0425dff824 GUI: Fix saving in a new slot with the list save dialog


Commit: 5867d5420f61c67af0af806382cec78652b8fb70
    https://github.com/scummvm/scummvm/commit/5867d5420f61c67af0af806382cec78652b8fb70
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-08-27T23:30:44+01:00

Commit Message:
GUI: Fix clicking in an empty space in the Grid Load dialog

This was unexpectedly closing the dialog.
This was a regression from 44e5d3f9 (GUI: Factor out save/load
activation to a function)

Changed paths:
    gui/saveload-dialog.cpp


diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp
index f221f86236..ac1783c591 100644
--- a/gui/saveload-dialog.cpp
+++ b/gui/saveload-dialog.cpp
@@ -811,7 +811,7 @@ const Common::U32String &SaveLoadChooserGrid::getResultString() const {
 
 void SaveLoadChooserGrid::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
 	const int slot = cmd + _curPage * _entriesPerPage - 1;
-	if (cmd <= _entriesPerPage) {
+	if (cmd <= _entriesPerPage && slot < _saveList.size()) {
 		activate(slot, Common::U32String());
 	}
 


Commit: 626d0ed4b6570864d199b5208e9aebb4ae642fc6
    https://github.com/scummvm/scummvm/commit/626d0ed4b6570864d199b5208e9aebb4ae642fc6
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-08-27T23:30:44+01:00

Commit Message:
GUI: Fix assert when double clicking on item in list save dialog

This was a regression from 44e5d3f9 (GUI: Factor out save/load
activation to a function).

This fixes part of bug #12850

Changed paths:
    gui/saveload-dialog.cpp


diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp
index ac1783c591..04e4a1dc9b 100644
--- a/gui/saveload-dialog.cpp
+++ b/gui/saveload-dialog.cpp
@@ -464,14 +464,20 @@ void SaveLoadChooserSimple::handleCommand(CommandSender *sender, uint32 cmd, uin
 		if (selItem >= 0 && _chooseButton->isEnabled()) {
 			if (_list->isEditable() || !_list->getSelectedString().empty()) {
 				_list->endEditMode();
-				activate(selItem, _list->getSelectedString());
+				Common::U32String description;
+				if (!_saveList.empty())
+					description = _list->getSelectedString();
+				activate(selItem, description);
 			}
 		}
 		break;
 	case kChooseCmd:
 		_list->endEditMode();
 		if (selItem >= 0) {
-			activate(selItem, _list->getSelectedString());
+			Common::U32String description;
+			if (!_saveList.empty())
+				description = _list->getSelectedString();
+			activate(selItem, description);
 		}
 		break;
 	case kListSelectionChangedCmd:


Commit: 0425dff8245fd07329753a1f9c9cf91b4e79c534
    https://github.com/scummvm/scummvm/commit/0425dff8245fd07329753a1f9c9cf91b4e79c534
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-08-27T23:30:44+01:00

Commit Message:
GUI: Fix saving in a new slot with the list save dialog

This revert part of a17816f1 (GUI: Warn when saving a "young" game
over an "older" one).

The issue was that when trying to save in a new slot with the list
save dialog, this was not creating the save.

This finishes to fix bug #12850

Changed paths:
    gui/saveload-dialog.cpp


diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp
index 04e4a1dc9b..407fa5e837 100644
--- a/gui/saveload-dialog.cpp
+++ b/gui/saveload-dialog.cpp
@@ -597,8 +597,6 @@ void SaveLoadChooserSimple::updateSelection(bool redraw) {
 
 	if (selItem >= 0 && _metaInfoSupport) {
 		SaveStateDescriptor desc = (_saveList[selItem].getLocked() ? _saveList[selItem] : _metaEngine->querySaveMetaInfos(_target.c_str(), _saveList[selItem].getSaveSlot()));
-		if (!_saveList[selItem].getLocked())
-			_saveList[selItem] = desc;
 
 		isDeletable = desc.getDeletableFlag() && _delSupport;
 		isWriteProtected = desc.getWriteProtectedFlag() ||