github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-19 02:19:31 +08:00
Code Projects Activity

[v3 windows] Handle null result from callbacks. Call results should respond on main thread.

Browse Source
This commit is contained in:
Lea Anthony 2023-06-09 20:33:52 +10:00
parent 7c45e3ac13
commit 81a5380f67
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
v3/pkg/application/messageprocessor_call.go
View File

@ -49,11 +49,14 @@ func (m *MessageProcessor) processCallMethod(method string, rw http.ResponseWrit
m.callErrorCallback(window, "Error calling method: %s", callID, err) m.callErrorCallback(window, "Error calling method: %s", callID, err)
return return
} }
// convert result to json var jsonResult = []byte("{}")
jsonResult, err := json.Marshal(result) if result != nil {
if err != nil { // convert result to json
m.callErrorCallback(window, "Error converting result to json: %s", callID, err) jsonResult, err = json.Marshal(result)
return if err != nil {
m.callErrorCallback(window, "Error converting result to json: %s", callID, err)
return
}
} }
m.callCallback(window, callID, string(jsonResult), true) m.callCallback(window, callID, string(jsonResult), true)
}() }()

4
v3/pkg/application/webview_window_windows.go
View File

@ -90,7 +90,9 @@ func (w *windowsWebviewWindow) setMaxSize(width, height int) {
} }
func (w *windowsWebviewWindow) execJS(js string) { func (w *windowsWebviewWindow) execJS(js string) {
w.chromium.Eval(js) invokeSync(func() {
w.chromium.Eval(js)
})
} }
func (w *windowsWebviewWindow) setBackgroundColour(color RGBA) { func (w *windowsWebviewWindow) setBackgroundColour(color RGBA) {