[Bf-blender-cvs] [e089b0e] master: Amend to previous own Fix T43684: only use hack on WIN32, and use case-insensitive comparison.

Bastien Montagne noreply at git.blender.org
Tue Feb 17 21:11:05 CET 2015


Commit: e089b0e91162fb0932bdb88e9905cdd9fb6b94dd
Author: Bastien Montagne
Date:   Tue Feb 17 21:08:59 2015 +0100
Branches: master
https://developer.blender.org/rBe089b0e91162fb0932bdb88e9905cdd9fb6b94dd

Amend to previous own Fix T43684: only use hack on WIN32, and use case-insensitive comparison.

Thanks to Campbell for the headup.

===================================================================

M	source/blender/editors/space_file/fsmenu.c

===================================================================

diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c
index 0cbb31b..6b4ee31 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -219,6 +219,7 @@ void ED_fsmenu_entry_set_name(struct FSMenuEntry *fsentry, const char *name)
 void fsmenu_entry_refresh_valid(struct FSMenuEntry *fsentry)
 {
 	if (fsentry->path && fsentry->path[0]) {
+#ifdef WIN32
 		/* XXX Special case, always consider those as valid.
 		 *     Thanks to Windows, which can spend five seconds to perform a mere stat() call on those paths...
 		 *     See T43684.
@@ -228,11 +229,12 @@ void fsmenu_entry_refresh_valid(struct FSMenuEntry *fsentry)
 		int i;
 
 		for (i = 0; exceptions[i]; i++) {
-			if (STREQLEN(fsentry->path, exceptions[i], exceptions_len[i])) {
+			if (STRCASEEQLEN(fsentry->path, exceptions[i], exceptions_len[i])) {
 				fsentry->valid = true;
 				return;
 			}
 		}
+#endif
 		fsentry->valid = BLI_is_dir(fsentry->path);
 	}
 	else {




More information about the Bf-blender-cvs mailing list