diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-23 23:06:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-23 23:06:09 +0300 |
| commit | af1f5423670f35cd8bb922d86d2b79da81c437ed (patch) | |
| tree | ba48c4a11bf34b5404d0de4b1df21f41b9716710 | |
| parent | f421558ac7ac43357de29f9933075241ac770ac1 (diff) | |
2.5 bugfix: splash would crash when .Blog contained file names without a
slash in them. Also removed the ctrl+alt+f1 shortcut key, was for testing.
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 676ba89bad5..5116b9b39a0 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1126,7 +1126,9 @@ static EnumPropertyItem *open_recentfile_splash_itemf(bContext *C, PointerRNA *p tmp.value= i+1; tmp.icon= ICON_FILE_BLEND; tmp.identifier= recent->filename; - tmp.name= BLI_last_slash(recent->filename)+1; + tmp.name= BLI_last_slash(recent->filename); + if(tmp.name) tmp.name += 1; + else tmp.name = recent->filename; RNA_enum_item_add(&item, &totitem, &tmp); } @@ -2732,7 +2734,6 @@ void wm_window_keymap(wmKeyConfig *keyconf) /* debug/testing */ WM_keymap_verify_item(keymap, "WM_OT_redraw_timer", TKEY, KM_PRESS, KM_ALT|KM_CTRL, 0); WM_keymap_verify_item(keymap, "WM_OT_debug_menu", DKEY, KM_PRESS, KM_ALT|KM_CTRL, 0); - WM_keymap_verify_item(keymap, "WM_OT_splash", F1KEY, KM_PRESS, KM_ALT|KM_CTRL, 0); WM_keymap_verify_item(keymap, "WM_OT_search_menu", SPACEKEY, KM_PRESS, 0, 0); /* Space switching */ |