Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2016-07-27 20:45:43 +0300
committerJulian Eisel <eiseljulian@gmail.com>2016-07-27 20:45:43 +0300
commit4559229163a513541913ab1f20fbc440ac136658 (patch)
tree1c396416c16cf1e043a6a3a79eb3a5997e9041b9 /source
parente4646c52c04f87d0d914a4741bb64cf9de89118e (diff)
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
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/interface/interface_handlers.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 11703208b2a..79831cefde6 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);