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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-08-11 15:56:02 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-08-11 15:56:02 +0400
commit9c9cd71a8612a2d85b10f9408199105ee09e70ad (patch)
treec86cd1ddfbdb216c075fb5d2a658e3ee5f0d12d4
parent165e6dbc07c4bf00fe492d4f65ea276a39628a85 (diff)
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.
-rw-r--r--source/blender/windowmanager/intern/wm_keymap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index 2fb0a1b2ab9..2dfe4d8ccdc 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -1009,7 +1009,8 @@ void WM_keyconfig_update(wmWindowManager *wm)
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);
}
}