tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-12-26 04:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): deadlock on window event handler

Browse Source
This commit is contained in:
Lucas Nogueira 2021-09-26 10:01:03 -03:00
parent 63ae30f187
commit 4866404f04
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/tauri-runtime-wry/src/lib.rs
View File

@ -2024,22 +2024,29 @@ fn handle_user_message(
} }
} }
} }
Message::Webview(id, webview_message) => { Message::Webview(id, webview_message) => match webview_message {
WebviewMessage::EvaluateScript(script) => {
if let Some(WindowHandle::Webview(webview)) = windows if let Some(WindowHandle::Webview(webview)) = windows
.lock() .lock()
.expect("poisoned webview collection") .expect("poisoned webview collection")
.get(&id) .get(&id)
.map(|w| &w.inner) .map(|w| &w.inner)
{ {
match webview_message {
WebviewMessage::EvaluateScript(script) => {
if let Err(e) = webview.evaluate_script(&script) { if let Err(e) = webview.evaluate_script(&script) {
eprintln!("{}", e); eprintln!("{}", e);
} }
} }
}
WebviewMessage::Print => { WebviewMessage::Print => {
if let Some(WindowHandle::Webview(webview)) = windows
.lock()
.expect("poisoned webview collection")
.get(&id)
.map(|w| &w.inner)
{
let _ = webview.print(); let _ = webview.print();
} }
}
WebviewMessage::WebviewEvent(event) => { WebviewMessage::WebviewEvent(event) => {
if let Some(event) = WindowEventWrapper::from(&event).0 { if let Some(event) = WindowEventWrapper::from(&event).0 {
for handler in window_event_listeners for handler in window_event_listeners
@ -2055,9 +2062,7 @@ fn handle_user_message(
} }
} }
} }
} },
}
}
Message::CreateWebview(handler, sender) => { Message::CreateWebview(handler, sender) => {
if let Some(event_loop) = event_loop { if let Some(event_loop) = event_loop {
match handler(event_loop, web_context) { match handler(event_loop, web_context) {