2.5 bugfix: splash would crash when .Blog contained file names without a
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 23 Nov 2009 20:06:09 +0000 (20:06 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 23 Nov 2009 20:06:09 +0000 (20:06 +0000)
slash in them. Also removed the ctrl+alt+f1 shortcut key, was for testing.

source/blender/windowmanager/intern/wm_operators.c

index 676ba89bad59b457a76660b925c1a4f7f14d9f0a..5116b9b39a038a17defbfb0554023a20cfe89613 100644 (file)
@@ -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 */