Fix compile issue

leaanthony · leaanthony · commit 8fd3af6e3651 · 2024-11-02T20:25:23.000+11:00
diff --git a/pkg/edge/create_env_native.go b/pkg/edge/create_env_native.go
@@ -23,7 +23,7 @@ func createCoreWebView2EnvironmentWithOptions(browserExecutableFolder, userDataF
 		return fmt.Errorf("Error calling UTF16PtrFromString for %s: %v", userDataFolder, err)
 	}
 
-	hr, err = webviewloader.CreateCoreWebView2EnvironmentWithOptions(
+	hr, err := webviewloader.CreateCoreWebView2EnvironmentWithOptions(
 		browserPathPtr,
 		userPathPtr,
 		uintptr(unsafe.Pointer(environmentCompletedHandle)),
@@ -34,10 +34,7 @@ func createCoreWebView2EnvironmentWithOptions(browserExecutableFolder, userDataF
 	}
 
 	if hr != 0 {
-		if err == nil || err == windows.ERROR_SUCCESS {
-			err = syscall.Errno(hr)
-		}
-		return err
+		return syscall.Errno(hr)
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func createCoreWebView2EnvironmentWithOptions(browserExecutableFolder, userDataF`
`23`	`23`	`return fmt.Errorf("Error calling UTF16PtrFromString for %s: %v", userDataFolder, err)`
`24`	`24`	`}`
`25`	`25`
`26`		`- hr, err = webviewloader.CreateCoreWebView2EnvironmentWithOptions(`
	`26`	`+ hr, err := webviewloader.CreateCoreWebView2EnvironmentWithOptions(`
`27`	`27`	`browserPathPtr,`
`28`	`28`	`userPathPtr,`
`29`	`29`	`uintptr(unsafe.Pointer(environmentCompletedHandle)),`
`@@ -34,10 +34,7 @@ func createCoreWebView2EnvironmentWithOptions(browserExecutableFolder, userDataF`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`if hr != 0 {`
`37`		`- if err == nil \|\| err == windows.ERROR_SUCCESS {`
`38`		`- err = syscall.Errno(hr)`
`39`		`- }`
`40`		`- return err`
	`37`	`+ return syscall.Errno(hr)`
`41`	`38`	`}`
`42`	`39`
`43`	`40`	`return nil`