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

Remove AppRunnerContainer::events

Browse source
This commit is contained in:
Emil Ernerfeldt 2022-11-16 12:50:45 +01:00
parent dfc1f2c470
commit aee64eed70
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/eframe/src/web/backend.rs
View file

@ -471,7 +471,6 @@ pub struct AppRunnerContainer {
/// Set to `true` if there is a panic. /// Set to `true` if there is a panic.
/// Used to ignore callbacks after a panic. /// Used to ignore callbacks after a panic.
pub panicked: Arc<AtomicBool>, pub panicked: Arc<AtomicBool>,
pub events: Vec<EventToUnsubscribe>,
} }
impl AppRunnerContainer { impl AppRunnerContainer {
@ -511,7 +510,10 @@ impl AppRunnerContainer {
closure, closure,
}; };
self.events.push(EventToUnsubscribe::TargetEvent(handle)); self.runner
.lock()
.events_to_unsubscribe
.push(EventToUnsubscribe::TargetEvent(handle));
Ok(()) Ok(())
} }
@ -542,7 +544,6 @@ fn start_runner(app_runner: AppRunner) -> Result<AppRunnerRef, JsValue> {
let mut runner_container = AppRunnerContainer { let mut runner_container = AppRunnerContainer {
runner: Arc::new(Mutex::new(app_runner)), runner: Arc::new(Mutex::new(app_runner)),
panicked: Arc::new(AtomicBool::new(false)), panicked: Arc::new(AtomicBool::new(false)),
events: Vec::with_capacity(20),
}; };
super::events::install_canvas_events(&mut runner_container)?; super::events::install_canvas_events(&mut runner_container)?;
@ -554,8 +555,6 @@ fn start_runner(app_runner: AppRunner) -> Result<AppRunnerRef, JsValue> {
// Disable all event handlers on panic // Disable all event handlers on panic
let previous_hook = std::panic::take_hook(); let previous_hook = std::panic::take_hook();
runner_container.runner.lock().events_to_unsubscribe = runner_container.events;
std::panic::set_hook(Box::new(move |panic_info| { std::panic::set_hook(Box::new(move |panic_info| {
tracing::info!("egui disabled all event handlers due to panic"); tracing::info!("egui disabled all event handlers due to panic");
runner_container.panicked.store(true, SeqCst); runner_container.panicked.store(true, SeqCst);