Merge pull request #935 from DioxusLabs/jk/fix-wry-segfault

Hotfix wry segfaulting by commenting out webcontext
This commit is contained in:
Jon Kelley authored and GitHub committed 2023-04-05 13:28:23 -07:00
commit 61d100e1f8
1 file changed
+6 -5
+6 -5
View File
@@ -7,7 +7,7 @@ use tao::event_loop::{EventLoopProxy, EventLoopWindowTarget};
pub use wry; pub use wry;
pub use wry::application as tao; pub use wry::application as tao;
use wry::application::window::Window; use wry::application::window::Window;
use wry::webview::{WebContext, WebView, WebViewBuilder}; use wry::webview::{WebView, WebViewBuilder};
pub fn build( pub fn build(
cfg: &mut Config, cfg: &mut Config,
@@ -33,8 +33,6 @@ pub fn build(
)); ));
} }
let mut web_context = WebContext::new(cfg.data_dir.clone());
let mut webview = WebViewBuilder::new(window) let mut webview = WebViewBuilder::new(window)
.unwrap() .unwrap()
.with_transparent(cfg.window.window.transparent) .with_transparent(cfg.window.window.transparent)
@@ -54,8 +52,11 @@ pub fn build(
.as_ref() .as_ref()
.map(|handler| handler(window, evet)) .map(|handler| handler(window, evet))
.unwrap_or_default() .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(..) { for (name, handler) in cfg.protocols.drain(..) {
webview = webview.with_custom_protocol(name, handler) webview = webview.with_custom_protocol(name, handler)