Merge pull request #7 from vultix/main

Cleaned up CallbackSystem::run method
aevyrie · Oct 30, 2023 · 4ff7482 · 4ff7482
2 parents 299ae64 + b8fc2ac
commit 4ff7482
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/crates/bevy_eventlistener_core/src/callbacks.rs b/crates/bevy_eventlistener_core/src/callbacks.rs
@@ -11,23 +11,18 @@ pub enum CallbackSystem {
 }
 
 impl CallbackSystem {
-    pub(crate) fn is_initialized(&self) -> bool {
-        matches!(self, CallbackSystem::Initialized(_))
-    }
-
     pub(crate) fn run(&mut self, world: &mut World) {
-        if !self.is_initialized() {
-            let mut temp = CallbackSystem::Empty;
-            std::mem::swap(self, &mut temp);
-            if let CallbackSystem::New(mut system) = temp {
+        let mut system = match std::mem::take(self) {
+            CallbackSystem::Empty => return,
+            CallbackSystem::New(mut system) => {
                 system.initialize(world);
-                *self = CallbackSystem::Initialized(system);
+                system
             }
-        }
-        if let CallbackSystem::Initialized(system) = self {
-            system.run((), world);
-            system.apply_deferred(world);
-        }
+            CallbackSystem::Initialized(system) => system,
+        };
+        system.run((), world);
+        system.apply_deferred(world);
+        *self = CallbackSystem::Initialized(system);
     }
 }