Merge pull request livecode#6935 from livecode/revert-6927-bugfix-21928

livecodepanos · web-flow · commit 048d701e363a · 2019-03-29T11:49:18.000+02:00
Revert "[[ Bug 21928 ]] Fix memory leak when using menu buttons"
diff --git a/docs/notes/bugfix-21928.md b/docs/notes/bugfix-21928.md
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -2860,23 +2860,11 @@ void MCButton::freemenu(Boolean force)
 		else
 		{
 			if (!MCStringIsEmpty(menustring) || force)
-            {
-                closemenu(False, True);
-                
-                /* In this case the button owns the menu so after removing
-                 * any references to it that might exist in the environment
-                 * it must be explicitly deleted. */
-                MCStack *t_menu_ptr = menu.Get();
-				MCdispatcher->removepanel(t_menu_ptr);
+			{
+				closemenu(False, True);
+				MCdispatcher->removepanel(menu);
 				MCstacks->deleteaccelerator(this, NULL);
-				t_menu_ptr->removeneed(this);
-                t_menu_ptr->dodel();
-                
-                /* It is safe to explicitly delete the menu stack here (rather
-                 * than 'scheduledelete()') as menu stacks and their contents
-                 * can never be on C stack as they don't contain script. */
-                delete t_menu_ptr;
-                
+				menu->removeneed(this);
 				menu = nil;
 			}
 		}
diff --git a/engine/src/stack.cpp b/engine/src/stack.cpp
@@ -1485,13 +1485,6 @@ void MCStack::removereferences()
     {
         MCdispatcher->remove_transient_stack(this);
     }
-    else if (!parent.IsValid() || parent->gettype() == CT_BUTTON)
-    {
-        /* If the parent is a button or non-existant then this is a
-         * menu-as-stack - registered with MCdispatcher as a panel. This code
-         * path is hit when performing dodel() on a menu-as-stack before it
-         * is explicitly deleted in MCButton::freemenu. */
-    }
     else if (parent->gettype() == CT_STACK)
     {
         remove(parent.GetAs<MCStack>()->substacks);

Original file line number	Diff line number	Diff line change
`@@ -1485,13 +1485,6 @@ void MCStack::removereferences()`
`1485`	`1485`	`{`
`1486`	`1486`	`MCdispatcher->remove_transient_stack(this);`
`1487`	`1487`	`}`
`1488`		`- else if (!parent.IsValid() \|\| parent->gettype() == CT_BUTTON)`
`1489`		`- {`
`1490`		`- /* If the parent is a button or non-existant then this is a`
`1491`		`- * menu-as-stack - registered with MCdispatcher as a panel. This code`
`1492`		`- * path is hit when performing dodel() on a menu-as-stack before it`
`1493`		`- * is explicitly deleted in MCButton::freemenu. */`
`1494`		`- }`
`1495`	`1488`	`else if (parent->gettype() == CT_STACK)`
`1496`	`1489`	`{`
`1497`	`1490`	`remove(parent.GetAs<MCStack>()->substacks);`