[[ Bug 20961 ]] Reset the menu object when swapping menus

montegoulding · montegoulding · commit 4e7a7df7b20c · 2018-03-19T08:27:22.000+11:00
This patch resets `MCmenuobjectptr` to `null` when changing from one
menu to another. This allows `openmenu` to set it to the new button and
and for `closemenu` to correctly set it to `null`. Previously
`MCmenuobjectptr` was left referring to the first button and therefore
not cleared on `closemenu` and leaving the button in an unable to delete
state.
diff --git a/docs/notes/bugfix-20961.md b/docs/notes/bugfix-20961.md
@@ -0,0 +1 @@
+# Clear the menu object when moving from one menu to another
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -911,6 +911,10 @@ Boolean MCButton::mfocus(int2 x, int2 y)
 						bptr->message_with_args(MCM_mouse_down, menubutton);
                         MCRedrawUnlockScreen();
 						bptr->findmenu();
+                        if (menudepth == 0)
+                        {
+                            MCmenuobjectptr = nullptr;
+                        }
 						bptr->openmenu(False);
 						return True;
 					}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Clear the menu object when moving from one menu to another`