[Scummvm-git-logs] scummvm master -> efebd805baa1d3a24f46e0dae3bab69a5f3ffd98

[djsrv]

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:
efebd805ba DIRECTOR: LINGO: Fix b_installMenu


Commit: efebd805baa1d3a24f46e0dae3bab69a5f3ffd98
    https://github.com/scummvm/scummvm/commit/efebd805baa1d3a24f46e0dae3bab69a5f3ffd98
Author: djsrv (dservilla at gmail.com)
Date: 2020-06-10T17:24:28-04:00

Commit Message:
DIRECTOR: LINGO: Fix b_installMenu

Menu items were associated with the wrong actions before.

Changed paths:
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index e79678a19a..22fdf77c83 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1548,11 +1548,6 @@ void LB::b_installMenu(int nargs) {
 				p++;
 
 			if (!submenuText.empty()) { // Adding submenu for previous menu
-				if (!command.empty()) {
-					handlers += g_lingo->genMenuHandler(&commandId, command);
-					submenuText += Common::String::format("[%d]", commandId);
-				}
-
 				menu->createSubMenuFromString(submenu, submenuText.c_str(), 0);
 			}
 
@@ -1585,6 +1580,8 @@ void LB::b_installMenu(int nargs) {
 		text.trim();
 		command.trim();
 
+		submenuText += text;
+
 		if (!submenuText.empty()) {
 			if (!command.empty()) {
 				handlers += g_lingo->genMenuHandler(&commandId, command);
@@ -1594,17 +1591,11 @@ void LB::b_installMenu(int nargs) {
 			}
 		}
 
-		submenuText += text;
-
 		if (!*s) // if we reached end of string, do not increment it but break
 			break;
 	}
 
 	if (!submenuText.empty()) {
-		if (!command.empty()) {
-			handlers += g_lingo->genMenuHandler(&commandId, command);
-			submenuText += Common::String::format("[%d]", commandId);
-		}
 		menu->createSubMenuFromString(submenu, submenuText.c_str(), 0);
 	}