From dc0df321b1caee0061d4867a20d56466395309a2 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Wed, 5 Apr 2023 13:00:27 -0700 Subject: [PATCH 1/2] Fix wry segfaulting by commenting out webcontext --- packages/desktop/src/webview.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/desktop/src/webview.rs b/packages/desktop/src/webview.rs index c5d8b4b42..a8e1d4995 100644 --- a/packages/desktop/src/webview.rs +++ b/packages/desktop/src/webview.rs @@ -33,8 +33,6 @@ pub fn build( )); } - let mut web_context = WebContext::new(cfg.data_dir.clone()); - let mut webview = WebViewBuilder::new(window) .unwrap() .with_transparent(cfg.window.window.transparent) @@ -54,8 +52,11 @@ pub fn build( .as_ref() .map(|handler| handler(window, evet)) .unwrap_or_default() - }) - .with_web_context(&mut web_context); + }); + + // These are commented out because wry is currently broken in wry + // let mut web_context = WebContext::new(cfg.data_dir.clone()); + // .with_web_context(&mut web_context); for (name, handler) in cfg.protocols.drain(..) { webview = webview.with_custom_protocol(name, handler) From 44c1e2e033344d970d5a14bcd17e742c3ae99871 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Wed, 5 Apr 2023 13:06:25 -0700 Subject: [PATCH 2/2] clippy --- packages/desktop/src/webview.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/desktop/src/webview.rs b/packages/desktop/src/webview.rs index a8e1d4995..099a2bd94 100644 --- a/packages/desktop/src/webview.rs +++ b/packages/desktop/src/webview.rs @@ -7,7 +7,7 @@ use tao::event_loop::{EventLoopProxy, EventLoopWindowTarget}; pub use wry; pub use wry::application as tao; use wry::application::window::Window; -use wry::webview::{WebContext, WebView, WebViewBuilder}; +use wry::webview::{WebView, WebViewBuilder}; pub fn build( cfg: &mut Config,