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

mutexes: crash rather than deadlock

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-05-17 16:42:46 +02:00
parent 88bfcd585e
commit 3737067994
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
emigui/src/context.rs
View file

@ -87,15 +87,15 @@ impl Context {
} }
pub fn memory(&self) -> parking_lot::MutexGuard<'_, Memory> { pub fn memory(&self) -> parking_lot::MutexGuard<'_, Memory> {
self.memory.lock() self.memory.try_lock().expect("memory already locked")
} }
pub fn graphics(&self) -> parking_lot::MutexGuard<'_, GraphicLayers> { pub fn graphics(&self) -> parking_lot::MutexGuard<'_, GraphicLayers> {
self.graphics.lock() self.graphics.try_lock().expect("graphics already locked")
} }
pub fn output(&self) -> parking_lot::MutexGuard<'_, Output> { pub fn output(&self) -> parking_lot::MutexGuard<'_, Output> {
self.output.lock() self.output.try_lock().expect("output already locked")
} }
/// Input previous frame. Compare to `input()` to check for changes. /// Input previous frame. Compare to `input()` to check for changes.
@ -127,11 +127,11 @@ impl Context {
// TODO: return MutexGuard // TODO: return MutexGuard
pub fn style(&self) -> Style { pub fn style(&self) -> Style {
*self.style.lock() *self.style.try_lock().expect("style already locked")
} }
pub fn set_style(&self, style: Style) { pub fn set_style(&self, style: Style) {
*self.style.lock() = style; *self.style.try_lock().expect("style already locked") = style;
} }
pub fn pixels_per_point(&self) -> f32 { pub fn pixels_per_point(&self) -> f32 {