Fix screenshot default filename when called out of test context

nowsprinting · May 2, 2024 · ca992c3 · ca992c3
1 parent f9b3315
commit ca992c3
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/RuntimeInternals/ScreenshotHelper.cs b/RuntimeInternals/ScreenshotHelper.cs
@@ -22,15 +22,17 @@ public static class ScreenshotHelper
         private static string DefaultFilename(string callerMemberName)
         {
 #if UNITY_INCLUDE_TESTS
-            return TestContext.CurrentTestExecutionContext.CurrentTest.Name
-                .Replace('(', '_')
-                .Replace(')', '_')
-                .Replace(',', '-')
-                .Replace("\"", "");
-            // Note: Same as the file name created under ActualImages of the Graphics Tests Framework package.
-#else
-            return callerMemberName;
+            if (TestContext.CurrentTestExecutionContext != null)
+            {
+                return TestContext.CurrentTestExecutionContext.CurrentTest.Name
+                    .Replace('(', '_')
+                    .Replace(')', '_')
+                    .Replace(',', '-')
+                    .Replace("\"", "");
+                // Note: Same as the file name created under ActualImages of the Graphics Tests Framework package.
+            }
 #endif
+            return callerMemberName;
         }
 
         /// <summary>