[Scummvm-git-logs] scummvm master -> 3e394d012d754e94c09269ed0316b5d40bdaaec2

[digitall]

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

Summary:
2a5429f947 GUI: Fix GCC Fall Through Warning
3e394d012d GUI: Fix Likely Incorrect Code Causing GCC Warnings


Commit: 2a5429f9478e4ac4d64bbd4468c046521ee63db7
    https://github.com/scummvm/scummvm/commit/2a5429f9478e4ac4d64bbd4468c046521ee63db7
Author: D G Turner (digitall at scummvm.org)
Date: 2021-11-13T05:56:51Z

Commit Message:
GUI: Fix GCC Fall Through Warning

Changed paths:
    gui/widgets/grid.cpp


diff --git a/gui/widgets/grid.cpp b/gui/widgets/grid.cpp
index 9574f87070..4ecfbd3d37 100644
--- a/gui/widgets/grid.cpp
+++ b/gui/widgets/grid.cpp
@@ -709,7 +709,7 @@ void GridWidget::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
 		// Redraw the grid, before we open the tray dialog
 		draw();
 		openTrayAtSelected();
-		// Fallthrough is intentional
+		// fall through
 	default:
 		sendCommand(cmd, 0);
 		break;


Commit: 3e394d012d754e94c09269ed0316b5d40bdaaec2
    https://github.com/scummvm/scummvm/commit/3e394d012d754e94c09269ed0316b5d40bdaaec2
Author: D G Turner (digitall at scummvm.org)
Date: 2021-11-13T05:57:19Z

Commit Message:
GUI: Fix Likely Incorrect Code Causing GCC Warnings

Changed paths:
    gui/launcher.cpp


diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 14ebd9a853..b6fb2d7cee 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -1041,8 +1041,9 @@ void LauncherSimple::updateListing() {
 
 		if (description.empty()) {
 			Common::String gameid;
-			if (!iter->_value.tryGetVal("gameid", gameid));
+			if (!iter->_value.tryGetVal("gameid", gameid)) {
 				gameid = iter->_key;
+			}
 
 			description = Common::String::format("Unknown (target %s, gameid %s)", iter->_key.c_str(), gameid.c_str());
 		}
@@ -1461,8 +1462,9 @@ void LauncherGrid::updateListing() {
 
 		if (description.empty()) {
 			Common::String gameid;
-			if (!iter->_value.tryGetVal("gameid", gameid));
+			if (!iter->_value.tryGetVal("gameid", gameid)) {
 				gameid = iter->_key;
+			}
 
 			description = Common::String::format("Unknown (target %s, gameid %s)", iter->_key.c_str(), gameid.c_str());
 		}