Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve wxWebViewEdge::RunScriptSync() error handling

Browse Source
This commit is contained in:
Tobias Taschner
2020-01-16 09:56:36 +01:00
parent 9f11abd8fc
commit 5dae0333b3
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/msw/webview_edge.cpp
View File

@@ -702,29 +702,32 @@ bool wxWebViewEdge::RunScriptSync(const wxString& javascript, wxString* output)
{
bool scriptExecuted = false;
HRESULT hr = m_impl->m_webView->ExecuteScript(javascript.wc_str(), Callback<IWebView2ExecuteScriptCompletedHandler>(
[&scriptExecuted, output](HRESULT error, PCWSTR result) -> HRESULT
// Start script execution
HRESULT executionResult = m_impl->m_webView->ExecuteScript(javascript.wc_str(), Callback<IWebView2ExecuteScriptCompletedHandler>(
[&scriptExecuted, &executionResult, output](HRESULT error, PCWSTR result) -> HRESULT
{
// Handle script execution callback
if (error == S_OK)
{
if (output)
output->assign(result);
}
else
wxLogError(_("RunScript failed: %.8x"), error);
executionResult = error;
scriptExecuted = true;
return S_OK;
}).Get());
// Wait for script exection
while (!scriptExecuted)
wxYield();
if (FAILED(hr))
if (FAILED(executionResult))
{
wxLogApiError("ExecuteScript", hr);
if (output)
output->Printf("%s (0x%08lx)", wxSysErrorMsgStr(executionResult), executionResult);
return false;
}
else