Merge pull request #931 from LSXAxeller/master

martindevans · web-flow · commit ce8b05c0005b · 2024-10-01T14:09:54.000+01:00
Fix: Increase Vulkan detection timeout to 12 seconds
diff --git a/LLama/Native/Load/SystemInfo.cs b/LLama/Native/Load/SystemInfo.cs
@@ -84,13 +84,11 @@ public static SystemInfo Get()
                         CreateNoWindow = true
                     }
                 };
-                var (exitCode, output, error, ok) = process.SafeRun(TimeSpan.FromSeconds(1));
+                var (exitCode, output, error, ok) = process.SafeRun(TimeSpan.FromSeconds(12));
 
-                if (!ok)
-                    return null;
-
-                // Return the output
-                return output;
+                // If ok return the output else return null 
+                return ok ? output :
+                    null;
             }
             catch
             {

Original file line number	Diff line number	Diff line change
`@@ -84,13 +84,11 @@ public static SystemInfo Get()`
`84`	`84`	`CreateNoWindow = true`
`85`	`85`	`}`
`86`	`86`	`};`
`87`		`- var (exitCode, output, error, ok) = process.SafeRun(TimeSpan.FromSeconds(1));`
	`87`	`+ var (exitCode, output, error, ok) = process.SafeRun(TimeSpan.FromSeconds(12));`
`88`	`88`
`89`		`- if (!ok)`
`90`		`- return null;`
`91`		`-`
`92`		`- // Return the output`
`93`		`- return output;`
	`89`	`+ // If ok return the output else return null`
	`90`	`+ return ok ? output :`
	`91`	`+ null;`
`94`	`92`	`}`
`95`	`93`	`catch`
`96`	`94`	`{`