diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-05 08:24:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-05 08:24:53 +0400 |
| commit | 65d6cecd68a22f140d2acc0d8dd5abf68723ed2e (patch) | |
| tree | 9ebb0aca923009ca09bd05f6f57297860a4a921d /source/blender/editors/interface/interface_icons.c | |
| parent | 2fc10e330335882390dfe7c70bcc78e975642b19 (diff) | |
patch [#34103] storage_bli_dir_contents.patch
from Lawrence D'Oliveiro (ldo)
BLI_dir_contents no longer changes current working directory.
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 0defc74a67b..09686d7b416 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -704,10 +704,8 @@ static void init_iconfile_list(struct ListBase *list) { IconFile *ifile; struct direntry *dir; - int restoredir = 1; /* restore to current directory */ int totfile, i, index = 1; const char *icondir; - char olddir[FILE_MAX]; list->first = list->last = NULL; icondir = BLI_get_folder(BLENDER_DATAFILES, "icons"); @@ -715,12 +713,7 @@ static void init_iconfile_list(struct ListBase *list) if (icondir == NULL) return; - /* since BLI_dir_contents changes the current working directory, restore it - * back to old value afterwards */ - if (!BLI_current_working_dir(olddir, sizeof(olddir))) - restoredir = 0; totfile = BLI_dir_contents(icondir, &dir); - if (restoredir && !chdir(olddir)) {} /* fix warning about checking return value */ for (i = 0; i < totfile; i++) { if ((dir[i].type & S_IFREG)) { |