github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix race condition in tauri and window not navigating in release mode

Browse Source
This commit is contained in:
Patrick Pacher
2024-03-27 12:52:52 +01:00
parent 3c0a362bff
commit 347e2d1982
5 changed files with 50 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/tauri/src-tauri/src/window.rs
View File

@@ -129,7 +129,7 @@ pub fn may_navigate_to_ui(win: &mut Window, force: bool) {
return;
}
if force || cfg!(debug_assertions) || win.url().host_str() != Some("localhost") {
if force || cfg!(debug_assertions) || win.url().as_str() == "tauri://localhost" {
#[cfg(debug_assertions)]
if let Ok(target_url) = std::env::var("TAURI_PM_URL") {
debug!("[tauri] navigating to {}", target_url);
@@ -147,5 +147,7 @@ pub fn may_navigate_to_ui(win: &mut Window, force: bool) {
#[cfg(not(debug_assertions))]
win.navigate("http://localhost:817".parse().unwrap());
} else {
error!("not navigating to user interface: current url: {}", win.url().as_str());
}
}