diff options
Diffstat (limited to 'engine/src')
| -rw-r--r-- | engine/src/windowing.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/src/windowing.rs b/engine/src/windowing.rs index 6d14af1..6086df8 100644 --- a/engine/src/windowing.rs +++ b/engine/src/windowing.rs @@ -5,7 +5,6 @@ use std::sync::{Arc, Condvar, Mutex, Weak}; use std::thread::Builder as ThreadBuilder; use crossbeam_queue::ArrayQueue; -use ecs::error::Error as EcsError; use raw_window_handle::{DisplayHandle, HandleError, HasDisplayHandle, WindowHandle}; use winit::application::ApplicationHandler; use winit::error::EventLoopError; @@ -48,6 +47,7 @@ use crate::windowing::window::{ Id as WindowId, Window, }; +use crate::{error, Error as EngineError}; pub mod dpi; pub mod keyboard; @@ -133,7 +133,7 @@ fn update_stuff( mut mouse_buttons: Single<MouseButtons>, mut actions: Actions, entity_obtainer: EntityObtainer, -) -> Result<(), EcsError> +) -> Result<(), EngineError> { if context.display_handle.is_none() { cold_path(); @@ -267,7 +267,7 @@ fn update_stuff( if shared_state.thread_panicked.load(Ordering::Relaxed) { cold_path(); - return Err("Windowing app thread panicked".into()); + return Err(error!("Windowing app thread panicked")); } if shared_state.has_thread_err.load(Ordering::Relaxed) { |