[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33087] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: Bugfix #24726

[Ton Roosendaal]

Revision: 33087
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33087
Author:   ton
Date:     2010-11-15 17:26:30 +0100 (Mon, 15 Nov 2010)

Log Message:
-----------
Bugfix #24726

Doing F1-load a lot of times on same .blend could crash. 
Janne karhu provided a potential fix, which is good to add
anyway. Will ask him to verify too.

Added XXX warning for these lines, after filesel exec no
context variables should be re-used. Is for later investigation.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2010-11-15 13:33:38 UTC (rev 33086)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2010-11-15 16:26:30 UTC (rev 33087)
@@ -1285,6 +1285,7 @@
 
 						retval= handler->op->type->exec(C, handler->op);
 
+						/* XXX check this carefully, CTX_wm_manager(C) == wm is a bit hackish */
 						if(handler->op->type->flag & OPTYPE_UNDO && CTX_wm_manager(C) == wm)
 							wm->op_undo_depth--;
 						
@@ -1292,7 +1293,8 @@
 							if(G.f & G_DEBUG)
 								wm_operator_print(handler->op);
 						
-						if(wm->op_undo_depth == 0)
+						/* XXX check this carefully, CTX_wm_manager(C) == wm is a bit hackish */
+						if(CTX_wm_manager(C) == wm && wm->op_undo_depth == 0)
 							if(handler->op->type->flag & OPTYPE_UNDO)
 								ED_undo_push_op(C, handler->op);