diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-31 01:38:01 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-31 01:38:01 +0400 |
| commit | e287e9d0c40d1cc9217f4ccfe4e26bbdc407c03e (patch) | |
| tree | ce4f9571c3fd1bbb2c2dc40b8ccd33e107dc36f2 /source/blender/blenlib | |
| parent | f0acdcf13526046236ce561736521100cba58ff1 (diff) | |
| parent | 6d5cf68aaf1347ff7456bb24a6b064c12aad0659 (diff) | |
Merged changes in the trunk up to revision 41387.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/path_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index bc24415fd3f..e03a7baca0c 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -1844,7 +1844,7 @@ void BLI_where_is_temp(char *fullname, const size_t maxlen, char *userdir) /* add a trailing slash if needed */ BLI_add_slash(fullname); #ifdef WIN32 - if(userdir != fullname) { + if(userdir && userdir != fullname) { BLI_strncpy(userdir, fullname, maxlen); /* also set user pref to show %TEMP%. /tmp/ is just plain confusing for Windows users. */ } #endif |