djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify eframe web panic handler code

Browse source
This commit is contained in:
Emil Ernerfeldt 2022-04-30 15:47:34 +02:00
parent 1983d19614
commit afd27ca664
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
eframe/src/web/backend.rs
View file

@ -407,23 +407,14 @@ fn start_runner(app_runner: AppRunner) -> Result<AppRunnerRef, JsValue> {
super::events::paint_and_schedule(&runner_container.runner, runner_container.panicked.clone())?; super::events::paint_and_schedule(&runner_container.runner, runner_container.panicked.clone())?;
// Disable all event handlers on panic // Disable all event handlers on panic
std::panic::set_hook(Box::new({ let previous_hook = std::panic::take_hook();
let previous_hook = std::panic::take_hook(); let panicked = runner_container.panicked;
std::panic::set_hook(Box::new(move |panic_info| {
tracing::info!("egui disabled all event handlers due to panic");
panicked.store(true, SeqCst);
let panicked = runner_container.panicked; // Propagate panic info to the previously registered panic hook
previous_hook(panic_info);
move |panic_info| {
tracing::info_span!("egui_panic_handler").in_scope(|| {
tracing::trace!("setting panicked flag");
panicked.store(true, SeqCst);
tracing::info!("egui disabled all event handlers due to panic");
});
// Propagate panic info to the previously registered panic hook
previous_hook(panic_info);
}
})); }));
Ok(runner_container.runner) Ok(runner_container.runner)