[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36287] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: fix for using enter on menus which load files:

[Campbell Barton]

Revision: 36287
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36287
Author:   campbellbarton
Date:     2011-04-23 03:31:27 +0000 (Sat, 23 Apr 2011)
Log Message:
-----------
fix for using enter on menus which load files:
 commonly Ctrl+N,Enter or Ctrl+O,Enter

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	2011-04-23 00:05:13 UTC (rev 36286)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2011-04-23 03:31:27 UTC (rev 36287)
@@ -1537,6 +1537,12 @@
 			}
 		}
 		
+		/* XXX fileread case, if the wm is freed then the handler's
+		 * will have been too so the code below need not run. */
+		if(CTX_wm_window(C)==NULL) {
+			return action;
+		}
+
 		/* XXX code this for all modal ops, and ensure free only happens here */
 		
 		/* modal ui handler can be tagged to be freed */ 
@@ -1546,10 +1552,6 @@
 				wm_event_free_handler(handler);
 			}
 		}
-		
-		/* XXX fileread case */
-		if(CTX_wm_window(C)==NULL)
-			return action;
 	}
 
 	/* test for CLICK event */