[Scummvm-git-logs] scummvm branch-2-8 -> 8db969873093802108d48b2ddd59373da8837ef8

[eriktorbjorn]

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:
8db9698730 SCUMM: Clean up Mac GUI screen corruption fix


Commit: 8db969873093802108d48b2ddd59373da8837ef8
    https://github.com/scummvm/scummvm/commit/8db969873093802108d48b2ddd59373da8837ef8
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-12-18T20:28:38+01:00

Commit Message:
SCUMM: Clean up Mac GUI screen corruption fix

This was the remains of a different method of forcing the menu to close.
It's no longer needed.

Changed paths:
    engines/scumm/gfx_mac.cpp


diff --git a/engines/scumm/gfx_mac.cpp b/engines/scumm/gfx_mac.cpp
index 41a4d835624..52fb29e2778 100644
--- a/engines/scumm/gfx_mac.cpp
+++ b/engines/scumm/gfx_mac.cpp
@@ -2694,12 +2694,10 @@ bool MacGui::handleMenu(int id, Common::String &name) {
 	int saveSlotToHandle = -1;
 	Common::String savegameName;
 
-	bool result = true;
-
 	switch (id) {
 	case 100:	// About
 		runAboutDialog();
-		break;
+		return true;
 
 	case 200:	// Open
 		if (runOpenDialog(saveSlotToHandle)) {
@@ -2710,7 +2708,7 @@ bool MacGui::handleMenu(int id, Common::String &name) {
 			}
 		}
 
-		break;
+		return true;
 
 	case 201:	// Save
 		if (runSaveDialog(saveSlotToHandle, savegameName)) {
@@ -2719,17 +2717,17 @@ bool MacGui::handleMenu(int id, Common::String &name) {
 			}
 		}
 
-		break;
+		return true;
 
 	case 202:	// Restart
 		if (runRestartDialog())
 			_vm->restart();
-		break;
+		return true;
 
 	case 203:	// Pause
 		if (!_vm->_messageBannerActive)
 			_vm->mac_showOldStyleBannerAndPause(_vm->getGUIString(gsPause), -1);
-		break;
+		return true;
 
 	// In the original, the Edit menu is active during save dialogs, though
 	// only Cut, Copy and Paste.
@@ -2739,14 +2737,10 @@ bool MacGui::handleMenu(int id, Common::String &name) {
 	case 302:	// Copy
 	case 303:	// Paste
 	case 304:	// Clear
-		break;
-
-	default:
-		result = false;
-		break;
+		return true;
 	}
 
-	return result;
+	return false;
 }
 
 void MacGui::updateWindowManager() {