Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/return-error-on-window-creation-failed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri-runtime-wry": "patch:bug"
---

Return `tauri_runtime::Error::CreateWindow` instead of panic on window creation failed
2 changes: 1 addition & 1 deletion crates/tauri-cli/src/mobile/android/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ fn detect_target_ok<'a>(env: &Env) -> Option<&'a Target<'a>> {
fn open_and_wait(config: &AndroidConfig, env: &Env) -> ! {
log::info!("Opening Android Studio");
if let Err(e) = os::open_file_with("Android Studio", config.project_dir(), &env.base) {
log::error!("{}", e);
log::error!("{e}");
}
loop {
sleep(Duration::from_secs(24 * 60 * 60));
Expand Down
2 changes: 1 addition & 1 deletion crates/tauri-cli/src/mobile/ios/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ fn detect_target_ok<'a>(env: &Env) -> Option<&'a Target<'a>> {
fn open_and_wait(config: &AppleConfig, env: &Env) -> ! {
log::info!("Opening Xcode");
if let Err(e) = os::open_file_with("Xcode", config.project_dir(), env) {
log::error!("{}", e);
log::error!("{e}");
}
loop {
sleep(Duration::from_secs(24 * 60 * 60));
Expand Down
13 changes: 8 additions & 5 deletions crates/tauri-runtime-wry/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3521,14 +3521,14 @@ fn handle_user_message<T: UserEvent>(
WebviewMessage::EvaluateScript(script, tx, span) => {
let _span = span.entered();
if let Err(e) = webview.evaluate_script(&script) {
log::error!("{}", e);
log::error!("{e}");
}
tx.send(()).unwrap();
}
#[cfg(not(all(feature = "tracing", not(target_os = "android"))))]
WebviewMessage::EvaluateScript(script) => {
if let Err(e) = webview.evaluate_script(&script) {
log::error!("{}", e);
log::error!("{e}");
}
}
WebviewMessage::Navigate(url) => {
Expand Down Expand Up @@ -3800,7 +3800,7 @@ fn handle_user_message<T: UserEvent>(
});
}
Err(e) => {
log::error!("{}", e);
log::error!("{e}");
}
}
}
Expand All @@ -3810,7 +3810,7 @@ fn handle_user_message<T: UserEvent>(
windows.0.borrow_mut().insert(window_id, webview);
}
Err(e) => {
log::error!("{}", e);
log::error!("{e}");
}
},
Message::CreateRawWindow(window_id, handler, sender) => {
Expand Down Expand Up @@ -4303,7 +4303,10 @@ fn create_window<T: UserEvent, F: Fn(RawWindow) + Send + 'static>(
}
};

let window = window_builder.inner.build(event_loop).unwrap();
let window = window_builder
.inner
.build(event_loop)
.map_err(|_| Error::CreateWindow)?;

#[cfg(feature = "tracing")]
{
Expand Down
1 change: 1 addition & 0 deletions crates/tauri-runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ pub enum Error {
/// Failed to create webview.
#[error("failed to create webview: {0}")]
CreateWebview(Box<dyn std::error::Error + Send + Sync>),
// TODO: Make it take an error like `CreateWebview` in v3
/// Failed to create window.
#[error("failed to create window")]
CreateWindow,
Expand Down
Loading