Merge pull request #1635 from Hoikas/fix_dupe_texture_export

Work around not-found textures.
H-uru · Dec 3, 2024 · ee3faf5 · ee3faf5
2 parents 7866ed2 + f9337d0
commit ee3faf5
Showing 1 changed file with 26 additions and 12 deletions.
diff --git a/Sources/MaxPlugin/MaxConvert/plBitmapCreator.cpp b/Sources/MaxPlugin/MaxConvert/plBitmapCreator.cpp
@@ -552,16 +552,23 @@ plBitmap *plBitmapCreator::ICreateTexture( plBitmapData *bd, const plLocation &l
     // Texture reuse optimization
     if( texture )
     {
-        WIN32_FILE_ATTRIBUTE_DATA fileAttrib;
-        GetFileAttributesExW(bd->fileName.WideString().data(), GetFileExInfoStandard, &fileAttrib);
-        FILETIME &fileTime = fileAttrib.ftLastWriteTime;
+        WIN32_FILE_ATTRIBUTE_DATA fileAttrib{};
+        if (GetFileAttributesExW(bd->fileName.WideString().data(), GetFileExInfoStandard, &fileAttrib) != FALSE)
+        {
+            FILETIME &fileTime = fileAttrib.ftLastWriteTime;
 
-        // If this texture has been modified since the last export, delete the old version but reuse the key
-        if (!texture->IsSameModifiedTime(fileTime.dwLowDateTime, fileTime.dwHighDateTime))
+            // If this texture has been modified since the last export, delete the old version but reuse the key
+            if (!texture->IsSameModifiedTime(fileTime.dwLowDateTime, fileTime.dwHighDateTime))
+            {
+                DeleteExportedBitmap( texture->GetKey() );
+                texture = nullptr;
+                key = nullptr;
+            }
+        }
+        else
         {
-            DeleteExportedBitmap( texture->GetKey() );
-            texture = nullptr;
-            key = nullptr;
+            // Well, this really sucks. We couldn't tell what the modify time is, so just pretend all is well (but assert in Debug mode)
+            hsAssert(0, ST::format("Couldn't get bitmap '{}' modify time: {}", bd->fileName, hsCOMError(hsLastWin32Error, GetLastError()).c_str()));
         }
     }
 
@@ -644,10 +651,17 @@ plBitmap *plBitmapCreator::ICreateTexture( plBitmapData *bd, const plLocation &l
         }
 
         // Texture reuse optimization
-        WIN32_FILE_ATTRIBUTE_DATA fileAttrib;
-        GetFileAttributesExW(bd->fileName.WideString().data(), GetFileExInfoStandard, &fileAttrib);
-        FILETIME &fileTime = fileAttrib.ftLastWriteTime;
-        texture->SetModifiedTime(fileTime.dwLowDateTime, fileTime.dwHighDateTime);
+        WIN32_FILE_ATTRIBUTE_DATA fileAttrib{};
+        if (GetFileAttributesExW(bd->fileName.WideString().data(), GetFileExInfoStandard, &fileAttrib) != FALSE)
+        {
+            FILETIME &fileTime = fileAttrib.ftLastWriteTime;
+            texture->SetModifiedTime(fileTime.dwLowDateTime, fileTime.dwHighDateTime);
+        }
+        else
+        {
+            // Well, this really sucks. We couldn't tell what the modify time is, so just pretend all is well (but assert in Debug mode)
+            hsAssert(0, ST::format("Couldn't set bitmap '{}' modify time: {}", bd->fileName, hsCOMError(hsLastWin32Error, GetLastError()).c_str()));
+        }
 
         // Add to our list of created textures and ref, since we have a hold of them
         IAddBitmap( texture );