[[ Bug 18293 ]] Clear MCmenuobjectptr

montegoulding · montegoulding · commit a967d7b44952 · 2017-05-26T18:22:45.000+10:00
The patch for bug 18293 leaves the button as the menu object but the popup stack has been deleted. This means the button can not be deleted itself. This patch checks if the button is the menu object when a menu is being deleted and sets `MCmenuobjectptr` to `nil`. (cherry picked from commit 167281c)
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -412,6 +412,9 @@ void MCButton::removelink(MCObject *optr)
 {
 	if (menu.IsBound() && optr == menu)
     {
+        if (this == MCmenuobjectptr)
+            MCmenuobjectptr = nil;
+        
         MCValueAssign(menuname, kMCEmptyName);
         menu = nil;
     }

Original file line number	Diff line number	Diff line change
`@@ -412,6 +412,9 @@ void MCButton::removelink(MCObject *optr)`
`412`	`412`	`{`
`413`	`413`	`if (menu.IsBound() && optr == menu)`
`414`	`414`	`{`
	`415`	`+ if (this == MCmenuobjectptr)`
	`416`	`+ MCmenuobjectptr = nil;`
	`417`	`+`
`415`	`418`	`MCValueAssign(menuname, kMCEmptyName);`
`416`	`419`	`menu = nil;`
`417`	`420`	`}`