src/sound/icon.rs

@@ -199,16 +199,17 @@ where
     fn build(&self, app: &mut App) {
         app.insert_resource(self.clone())
             .register_type::<SoundIcon>()
-            .add_systems((added, reset_timer_on_visibility_gain).in_base_set(CoreSet::PreUpdate))
+            .add_system(added.in_base_set(CoreSet::PreUpdate))
             .add_systems(
                 (exploration_focus_changed, update::<S>)
                     .chain()
-                    .in_base_set(CoreSet::PreUpdate),
+                    .in_base_set(CoreSet::PostUpdate),
             )
             .add_system(
                 exploration_focus_removed
                     .in_base_set(CoreSet::PostUpdate)
                     .after(exploration_focus_changed),
-            );
+            )
+            .add_system(reset_timer_on_visibility_gain.in_base_set(CoreSet::PostUpdate));
     }
 }

src/sound/volumetric.rs

@@ -39,16 +39,10 @@ fn update(
     }
 }
 
-fn removed(
-    mut commands: Commands,
-    mut removed: RemovedComponents<Volumetric>,
-    transforms: Query<Entity, (With<Transform>, With<GlobalTransform>)>,
-) {
+fn removed(mut commands: Commands, mut removed: RemovedComponents<Volumetric>) {
     for entity in &mut removed {
-        if transforms.get(entity).is_ok() {
         commands.entity(entity).insert(TransformBundle::default());
     }
-    }
 }
 
 pub struct VolumetricPlugin;