From 1145d50937f0114eefccc9b7722fc2be013cd454 Mon Sep 17 00:00:00 2001 From: Chip Reed Date: Mon, 16 Aug 2021 21:45:21 -0700 Subject: [PATCH 1/2] fix async multiwindow deadlock --- .changes/async-multiwindow.md | 5 +++++ src/webview/web_context.rs | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 .changes/async-multiwindow.md diff --git a/.changes/async-multiwindow.md b/.changes/async-multiwindow.md new file mode 100644 index 000000000..b0c697396 --- /dev/null +++ b/.changes/async-multiwindow.md @@ -0,0 +1,5 @@ +--- +"wry": patch +--- + +Fixed a Linux multi-window issue where the internal url loader didn't unlock when flushed while empty \ No newline at end of file diff --git a/src/webview/web_context.rs b/src/webview/web_context.rs index 2cf8cee91..816d2cdb5 100644 --- a/src/webview/web_context.rs +++ b/src/webview/web_context.rs @@ -404,6 +404,8 @@ pub mod unix { }); webview.load_uri(url.as_str()); + } else { + self.unlock(); } } } From 0544d4eb7bf7a05b1d81fe7e060c6a0e0f39e1ec Mon Sep 17 00:00:00 2001 From: Chip Reed Date: Mon, 16 Aug 2021 21:49:41 -0700 Subject: [PATCH 2/2] cargo +nightly fmt --- src/webview/web_context.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webview/web_context.rs b/src/webview/web_context.rs index 816d2cdb5..05d34338a 100644 --- a/src/webview/web_context.rs +++ b/src/webview/web_context.rs @@ -405,7 +405,7 @@ pub mod unix { webview.load_uri(url.as_str()); } else { - self.unlock(); + self.unlock(); } } }