diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-20 20:39:22 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-20 20:57:11 +0400 |
| commit | 163e544006ffb7224afdce083c41eb0698b0be15 (patch) | |
| tree | ba9c14096c9ed05237f53f1d7949416393d72843 /source/blender/editors/space_file/fsmenu.c | |
| parent | aec90a8fafe19dfad110d9473d3f70e3aeeb8771 (diff) | |
Fix bookmarks not appearing in file browser after "copy previous settings".
Diffstat (limited to 'source/blender/editors/space_file/fsmenu.c')
| -rw-r--r-- | source/blender/editors/space_file/fsmenu.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 62cf4889797..201abf6934a 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -545,11 +545,16 @@ void fsmenu_refresh_system_category(struct FSMenu *fsmenu) fsmenu_read_system(fsmenu, TRUE); } -void fsmenu_free(struct FSMenu *fsmenu) +void fsmenu_free(void) { - fsmenu_free_category(fsmenu, FS_CATEGORY_SYSTEM); - fsmenu_free_category(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS); - fsmenu_free_category(fsmenu, FS_CATEGORY_BOOKMARKS); - fsmenu_free_category(fsmenu, FS_CATEGORY_RECENT); - MEM_freeN(fsmenu); + if (g_fsmenu) { + fsmenu_free_category(g_fsmenu, FS_CATEGORY_SYSTEM); + fsmenu_free_category(g_fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS); + fsmenu_free_category(g_fsmenu, FS_CATEGORY_BOOKMARKS); + fsmenu_free_category(g_fsmenu, FS_CATEGORY_RECENT); + MEM_freeN(g_fsmenu); + } + + g_fsmenu = NULL; } + |