diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-06-04 12:54:21 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-06-04 12:54:32 +0400 |
| commit | 86f42ee33137897ec08ddde0fdcd2d1087ea78dc (patch) | |
| tree | 6b5be81008d11763f2ae34961bc3cae510865555 | |
| parent | 812515b623be9179e67d97b84b10df587244d38c (diff) | |
OSX 10.10: fix for Blender crashing on fsmenu due icloud in the favorite list but pointer is NULL when not activated
This does not break other OSX versions, just add a check for pathString
| -rw-r--r-- | source/blender/editors/space_file/fsmenu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 6284caf1456..d049a45fd90 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -441,7 +441,7 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks) pathString = CFURLCopyFileSystemPath(cfURL, kCFURLPOSIXPathStyle); - if (!CFStringGetCString(pathString, line, sizeof(line), kCFStringEncodingASCII)) + if (pathString == NULL || !CFStringGetCString(pathString, line, sizeof(line), kCFStringEncodingASCII)) continue; fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, FS_INSERT_SORTED); |