[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39302] trunk/blender/source/blender/ windowmanager/intern/wm_keymap.c: Fix #28180: crash running wm.keyconfigs. user.keymaps.new("My Keymap").

Brecht Van Lommel brechtvanlommel at pandora.be
Thu Aug 11 13:56:02 CEST 2011


Revision: 39302
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39302
Author:   blendix
Date:     2011-08-11 11:56:02 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
Fix #28180: crash running wm.keyconfigs.user.keymaps.new("My Keymap").
There isn't much point in doing this at the moment, but shouldn't crash.

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

Modified: trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2011-08-11 11:41:24 UTC (rev 39301)
+++ trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2011-08-11 11:56:02 UTC (rev 39302)
@@ -1009,7 +1009,8 @@
 			addonmap= WM_keymap_list_find(&wm->addonconf->keymaps, km->idname, km->spaceid, km->regionid);
 
 			/* diff */
-			wm_keymap_diff_update(&U.user_keymaps, defaultmap, addonmap, km);
+			if(defaultmap)
+				wm_keymap_diff_update(&U.user_keymaps, defaultmap, addonmap, km);
 		}
 	}
 




More information about the Bf-blender-cvs mailing list