[Bf-blender-cvs] [4559229] master: Fix memory leak when closing Blender with operator popup open

Julian Eisel noreply at git.blender.org
Wed Jul 27 19:49:51 CEST 2016


Commit: 4559229163a513541913ab1f20fbc440ac136658
Author: Julian Eisel
Date:   Wed Jul 27 19:45:43 2016 +0200
Branches: master
https://developer.blender.org/rB4559229163a513541913ab1f20fbc440ac136658

Fix memory leak when closing Blender with operator popup open

Steps to reproduce:
* Default startup.blend
* RMB-Click on "Cube" item in outliner
* Select Remap Users
* Close Blender using window 'x' button

===================================================================

M	source/blender/editors/interface/interface_handlers.c

===================================================================

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 1170320..79831ce 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -10156,6 +10156,10 @@ static void ui_popup_handler_remove(bContext *C, void *userdata)
 {
 	uiPopupBlockHandle *menu = userdata;
 
+	if (menu->cancel_func) {
+		menu->cancel_func(C, menu->popup_arg);
+	}
+
 	/* free menu block if window is closed for some reason */
 	ui_popup_block_free(C, menu);




More information about the Bf-blender-cvs mailing list