diff --git a/crates/egui_extras/src/loaders/ehttp_loader.rs b/crates/egui_extras/src/loaders/ehttp_loader.rs index 1d3e20c90..d1cc68df9 100644 --- a/crates/egui_extras/src/loaders/ehttp_loader.rs +++ b/crates/egui_extras/src/loaders/ehttp_loader.rs @@ -101,7 +101,6 @@ impl BytesLoader for EhttpLoader { { let entry = entry.get_mut(); *entry = Poll::Ready(result); - ctx.request_repaint(); log::trace!("Finished loading {uri:?}"); true } else { diff --git a/crates/egui_extras/src/loaders/file_loader.rs b/crates/egui_extras/src/loaders/file_loader.rs index 5e66b76da..13fd7ca69 100644 --- a/crates/egui_extras/src/loaders/file_loader.rs +++ b/crates/egui_extras/src/loaders/file_loader.rs @@ -100,7 +100,6 @@ impl BytesLoader for FileLoader { if let std::collections::hash_map::Entry::Occupied(mut entry) = cache.entry(uri.clone()) { let entry = entry.get_mut(); *entry = Poll::Ready(result); - ctx.request_repaint(); log::trace!("Finished loading {uri:?}"); true } else { diff --git a/crates/epaint/src/mutex.rs b/crates/epaint/src/mutex.rs index 0aa823a75..4bd374202 100644 --- a/crates/epaint/src/mutex.rs +++ b/crates/epaint/src/mutex.rs @@ -30,9 +30,12 @@ mod mutex_impl { #[cfg_attr(debug_assertions, track_caller)] pub fn lock(&self) -> MutexGuard<'_, T> { if cfg!(debug_assertions) { - self.0 - .try_lock_for(DEADLOCK_DURATION) - .expect("Looks like a deadlock!") + self.0.try_lock_for(DEADLOCK_DURATION).unwrap_or_else(|| { + panic!( + "DEBUG PANIC: Failed to acquire Mutex after {}s. Deadlock?", + DEADLOCK_DURATION.as_secs() + ) + }) } else { self.0.lock() } @@ -161,9 +164,12 @@ mod rw_lock_impl { #[cfg_attr(debug_assertions, track_caller)] pub fn read(&self) -> RwLockReadGuard<'_, T> { let guard = if cfg!(debug_assertions) { - self.0 - .try_read_for(DEADLOCK_DURATION) - .expect("Looks like a deadlock!") + self.0.try_read_for(DEADLOCK_DURATION).unwrap_or_else(|| { + panic!( + "DEBUG PANIC: Failed to acquire RwLock read after {}s. Deadlock?", + DEADLOCK_DURATION.as_secs() + ) + }) } else { self.0.read() }; @@ -174,9 +180,12 @@ mod rw_lock_impl { #[cfg_attr(debug_assertions, track_caller)] pub fn write(&self) -> RwLockWriteGuard<'_, T> { let guard = if cfg!(debug_assertions) { - self.0 - .try_write_for(DEADLOCK_DURATION) - .expect("Looks like a deadlock!") + self.0.try_write_for(DEADLOCK_DURATION).unwrap_or_else(|| { + panic!( + "DEBUG PANIC: Failed to acquire RwLock write after {}s. Deadlock?", + DEADLOCK_DURATION.as_secs() + ) + }) } else { self.0.write() };