Home Explore Help
Sign In
cpp
/
panda3d
mirror of https://github.com/panda3d/panda3d
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

fix Filename::is_regular_file

David Rose 23 years ago
parent
93fbd33e19
commit
9e6d6c9f4c
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      dtool/src/dtoolutil/filename.cxx
  2. 1 1
      ppremake/filename.cxx

+ 1 - 1
dtool/src/dtoolutil/filename.cxx
View File 

@@ -759,7 +759,7 @@ is_regular_file() const {
 
 
   DWORD results = GetFileAttributes(os_specific.c_str());
 
   if (results != -1) {
 
-    isreg = (results == FILE_ATTRIBUTE_NORMAL);
 
+    isreg = ((results & (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_DEVICE)) == 0);
 
   }
 
 
 #else  // WIN32_VC

+ 1 - 1
ppremake/filename.cxx
View File 

@@ -759,7 +759,7 @@ is_regular_file() const {
 
 
   DWORD results = GetFileAttributes(os_specific.c_str());
 
   if (results != -1) {
 
-    isreg = (results == FILE_ATTRIBUTE_NORMAL);
 
+    isreg = ((results & (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_DEVICE)) == 0);
 
   }
 
 
 #else  // WIN32_VC