[Scummvm-git-logs] scummvm branch-2-2 -> cfeecdec271dfedc953cf40a27bd1ca3ee9ef917

[criezy]

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

Summary:
cfeecdec27 GUI: Fix SaveLoadChooserGrid not disabling write protected slots


Commit: cfeecdec271dfedc953cf40a27bd1ca3ee9ef917
    https://github.com/scummvm/scummvm/commit/cfeecdec271dfedc953cf40a27bd1ca3ee9ef917
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-09-12T21:44:04+01:00

Commit Message:
GUI: Fix SaveLoadChooserGrid not disabling write protected slots

This was broken in commit f24a89e that disabled the slots when they
are locked due to cloud sync.

Changed paths:
    gui/saveload-dialog.cpp


diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp
index 62678647b4..c1eedde3af 100644
--- a/gui/saveload-dialog.cpp
+++ b/gui/saveload-dialog.cpp
@@ -1133,14 +1133,12 @@ void SaveLoadChooserGrid::updateSaves() {
 
 		// In save mode we disable the button, when it's write protected.
 		// TODO: Maybe we should not display it at all then?
-		if (_saveMode && desc.getWriteProtectedFlag()) {
+		// We also disable and description the button if slot is locked
+		if ((_saveMode && desc.getWriteProtectedFlag()) || desc.getLocked()) {
 			curButton.button->setEnabled(false);
 		} else {
 			curButton.button->setEnabled(true);
 		}
-
-		//that would make it look "disabled" if slot is locked
-		curButton.button->setEnabled(!desc.getLocked());
 		curButton.description->setEnabled(!desc.getLocked());
 	}