UI: alternate fix for empty context menu

block and layout could be NULL and checking this everywhere
wasn't practical.

Instead of lazy initializing, add UI_popup_menu_end_or_cancel
which cancels empty popup menus.

1 files changed, 15 insertions, 0 deletions

diff --git a/source/blender/editors/interface/interface_region_menu_popup.c b/source/blender/editors/interface/interface_region_menu_popup.c
index 9aec955413f..fa7113f195e 100644
--- a/source/blender/editors/interface/interface_region_menu_popup.c
+++ b/source/blender/editors/interface/interface_region_menu_popup.c
@@ -454,6 +454,21 @@ void UI_popup_menu_end(bContext *C, uiPopupMenu *pup)
 	MEM_freeN(pup);
 }
 
+bool UI_popup_menu_end_or_cancel(bContext *C, uiPopupMenu *pup)
+{
+	if (!UI_block_is_empty(pup->block)) {
+		UI_popup_menu_end(C, pup);
+		return true;
+	}
+	else {
+		UI_block_layout_resolve(pup->block, NULL, NULL);
+		MEM_freeN(pup->block->handle);
+		UI_block_free(C, pup->block);
+		MEM_freeN(pup);
+		return false;
+	}
+}
+
 uiLayout *UI_popup_menu_layout(uiPopupMenu *pup)
 {
 	return pup->layout;