From 6c1e5beeec9ea289849a36242b365d008cadd729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lex=20Rom=C3=A1n=20N=C3=BA=C3=B1ez?=
 <eirexe@eirteam.moe>
Date: Sat, 19 Sep 2026 17:33:07 +0200
Subject: [PATCH] Cleanup battle UI on exit

---
 src/ui/battle_ui.rs | 6 ++++++
 src/ui/mod.rs       | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/ui/battle_ui.rs b/src/ui/battle_ui.rs
index 34cd379..3013b58 100644
--- a/src/ui/battle_ui.rs
+++ b/src/ui/battle_ui.rs
@@ -49,3 +49,9 @@ pub fn spawn_battle_ui(mut commands: Commands, request: Res<PendingMatch>, fight
 
     Ok(())
 }
+
+pub fn cleanup_battle_ui(mut commands: Commands, battle_ui: Query<Entity, With<BattleUI>>) {
+    for entity in battle_ui {
+        commands.entity(entity).despawn();
+    }
+}
\ No newline at end of file
diff --git a/src/ui/mod.rs b/src/ui/mod.rs
index 75b319f..f393c32 100644
--- a/src/ui/mod.rs
+++ b/src/ui/mod.rs
@@ -12,6 +12,7 @@ pub struct InGameUIPlugin;
 impl Plugin for InGameUIPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(OnEnter(AppState::InMatch), battle_ui::spawn_battle_ui)
+            .add_systems(OnExit(AppState::InMatch), battle_ui::cleanup_battle_ui)
             .add_systems(PostUpdate, fighter_info::update_fighter_info_damage);
     }
 }